aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 23:07:55 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-06-03 23:07:55 +0800
commit8bebb05056fd093d0302546fc65edb130c3c136a (patch)
treed6b46a985b77386944f97ac87d203fdc912497fc /shell
parent54a9260f696f5c7462f40af8f838d723ba3abeb5 (diff)
downloadgsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.gz
gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.tar.zst
gsoc2013-evolution-8bebb05056fd093d0302546fc65edb130c3c136a.zip
** Fix for bug #386503 from Matthew Barnes
svn path=/trunk/; revision=33647
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-window.c2
-rw-r--r--shell/main.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ecf87434e7..02572610ac 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,12 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fix for bug #386503 from Matthew Barnes
+
+ * e-shell-window.c: (e_shell_window_new):
+ * main.c: (main):
+
+2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
+
** Fix for version removal from Installed files from Gilles Dartiguelongue
* Makefile.am:
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index a5475b078f..c6ec497234 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -1066,7 +1066,7 @@ e_shell_window_new (EShell *shell,
bonobo_ui_util_set_ui (priv->ui_component,
PREFIX,
xmlfile,
- "evolution-" BASE_VERSION, NULL);
+ "evolution", NULL);
g_free (xmlfile);
e_shell_window_commands_setup (window);
diff --git a/shell/main.c b/shell/main.c
index 9667b862f8..407286d4fb 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -502,7 +502,7 @@ main (int argc, char **argv)
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_GOPTION_CONTEXT, context,
GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),