aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/main.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7ea06f5314..0cb14c6725 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-28 Rodney Dawes <dobey@ximian.com>
+
+ * main.c (main): Call gnome_program_init with PACKAGE "-" BASE_VERSION
+ so that we start up the right version of evolution when we get killed
+ by logout or whatever
+
+ Fixes #54087
+
2004-04-27 JP Rosevear <jpr@ximian.com>
* e-shell-window.c (sidebar_button_selected_callback): init the
diff --git a/shell/main.c b/shell/main.c
index ccc3040d05..5cc459e528 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -529,7 +529,7 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+ program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_POPT_TABLE, options,
GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),