[evolution-patches] Patch : kill eds 1.2 for evolution 2.2.x

[Frederic Crozat <fcrozat mandriva com>]

This patch is for 2.10 branch only, it also kill
evolution-data-server-1.2 when running --force-shutdown (it is already
fixed on HEAD).

Permission to commit ?

-- 
Frederic Crozat <fcrozat mandriva com>
Mandriva

? evolution-fixdataserverapi.patch
? evolution-killeds12.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1468.2.8
diff -u -p -r1.1468.2.8 ChangeLog
--- ChangeLog	28 Sep 2004 04:49:06 -0000	1.1468.2.8
+++ ChangeLog	24 May 2005 08:51:43 -0000
@@ -1,3 +1,8 @@
+2005-05-24  Frederic Crozat  <fcrozat mandriva com>
+
+	* main.c: (kill_dataserver):
+	Kill evolution-data-server-1.2 too.
+
 2004-09-24  Not Zed  <NotZed Ximian com>
 
 	* e-shell-window-commands.c: Added ed catmur to the credits.
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.160.2.1
diff -u -p -r1.160.2.1 main.c
--- main.c	13 Sep 2004 21:48:13 -0000	1.160.2.1
+++ main.c	24 May 2005 08:51:43 -0000
@@ -125,6 +125,7 @@ kill_dataserver (void)
 
 	system (KILL_PROCESS_CMD " -9 lt-evolution-data-server 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.0 2> /dev/null");
+	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null");
 
 	system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null");