Re: [evolution-patches] kill alarm daemon patch

[Rodrigo Moya <rodrigo ximian com>]

On Wed, 2003-05-14 at 18:41, Dan Winship wrote:
> On Wed, 2003-05-14 at 12:03, Rodrigo Moya wrote:
> > this makes the wombat killing code kill also the alarm daemon, so that
> > no old versions are kept around.
> 
> Your addition looks good, but there needs to be an #ifdef
> KILL_PROCESS_CMD around something there, as with the killev stuff. The
> configure check lets you build evo even if you don't have pkill or
> killall.
> 
updated patch attached

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1271
diff -u -p -r1.1271 ChangeLog
--- ChangeLog	9 May 2003 15:00:46 -0000	1.1271
+++ ChangeLog	14 May 2003 20:40:10 -0000
@@ -1,3 +1,9 @@
+2003-05-14  Rodrigo Moya <rodrigo ximian com>
+
+	* main.c: #ifdef'ed wombat killing code, depending on whether
+	KILL_PROCESS_CMD is defined or not.
+	(kill_wombat): kill also the alarm daemon process.
+
 2003-05-09  Jeremy Katz  <katzj redhat com>
 
 	* main.c: Add a #include to fix a warning.
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.121
diff -u -p -r1.121 main.c
--- main.c	9 May 2003 15:00:46 -0000	1.121
+++ main.c	14 May 2003 20:40:11 -0000
@@ -171,6 +171,8 @@ shell_weak_notify (void *data,
 }
 
 
+#ifdef KILL_PROCESS_CMD
+
 static void
 kill_wombat (void)
 {
@@ -178,6 +180,9 @@ kill_wombat (void)
 
 	system (KILL_PROCESS_CMD " -9 lt-evolution-wombat 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-wombat 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");
 }
 
 static void
@@ -216,6 +221,7 @@ kill_old_wombat (void)
 	CORBA_Object_release (iface, &ev);
 	CORBA_exception_free (&ev);
 }
+#endif
 
 
 /* Warning dialog to scare people off a little bit.  */
@@ -350,7 +356,9 @@ idle_cb (void *data)
 	gboolean display_default;
 	gboolean displayed_any;
 
+#ifdef KILL_PROCESS_CMD
 	kill_old_wombat ();
+#endif
 
 	CORBA_exception_init (&ev);