aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2005-05-12 21:11:21 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2005-05-12 21:11:21 +0800
commit20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2 (patch)
tree3b5da727dc4efc0ff70b116edcf6593966569c9f /shell
parent29bb024c1a298a207bc196c66e3e8dbb14ae1571 (diff)
downloadgsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar.gz
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar.bz2
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar.lz
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar.xz
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.tar.zst
gsoc2013-evolution-20ef8f97a52cd7ce155f88bbfd4f911119e3d2e2.zip
add evolution-data-server-1.2 to the list of old dataserver instances.)
2005-05-12 Harish Krishnaswamy <kharish@novell.com> * main.c: (kill_dataserver): add evolution-data-server-1.2 to the list of old dataserver instances.) svn path=/trunk/; revision=29342
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/main.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 815c3e9214..d1fe595dc7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12 Harish Krishnaswamy <kharish@novell.com>
+
+ * main.c: (kill_dataserver): add evolution-data-server-1.2
+ to the list of old dataserver instances.
+
2005-05-06 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #301459
diff --git a/shell/main.c b/shell/main.c
index 44605041ff..11ee72a607 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -134,6 +134,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");