aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/main.c8
2 files changed, 14 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2a81ecd81f..d48f6c08af 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-15 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-15 Ettore Perazzoli <ettore@ximian.com>
[Patch from Antonio Xu <antonio.xu@sun.com>, #42491]
diff --git a/shell/main.c b/shell/main.c
index 37cb7cdc8b..02bc4818d6 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -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);