Substitute version number into the evolution binary name in the server

	* Makefile.am ($(server_in_files)): Substitute version number into
	the evolution binary name in the server file
	(INCLUDES): define EVOLUTION_TOOLSDIR

	* GNOME_Evolution_Shell.server.in.in: Clean up server names. Add
	"-@VERSION@" to the end of the shell binary name

	* main.c (main): if KILL_PROCESS_CMD is defined, add a
	--force-shutdown argument that runs killev and exits.

svn path=/trunk/; revision=20702

1 files changed, 11 insertions, 0 deletions

diff --git a/shell/main.c b/shell/main.c
index 8aa3b9b79a..db04513a5c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -86,6 +86,7 @@ static gboolean no_splash = FALSE;
 static gboolean start_online = FALSE;
 static gboolean start_offline = FALSE;
 static gboolean force_upgrade = FALSE;
+static gboolean killev = FALSE;
 
 extern char *evolution_debug_log;
 
@@ -528,6 +529,10 @@ main (int argc, char **argv)
 		  N_("Start in offline mode"), NULL },
 		{ "online", '\0', POPT_ARG_NONE, &start_online, 0, 
 		  N_("Start in online mode"), NULL },
+#ifdef KILL_PROCESS_CMD
+		{ "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, 
+		  N_("Forcibly shut down all evolution components"), NULL },
+#endif
 		{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, 
 		  N_("Send the debugging output of all components to a file."), NULL },
 #if 0
@@ -562,6 +567,12 @@ main (int argc, char **argv)
 		exit (1);
 	}
 
+	if (killev) {
+		execl (EVOLUTION_TOOLSDIR "/killev", "killev", NULL);
+		/* Not reached */
+		exit (0);
+	}
+
 	setup_segv_redirect ();
 	
 	if (evolution_debug_log) {