aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/Evolution-Component.idl2
-rw-r--r--shell/main.c5
3 files changed, 8 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 86b741cba5..a4aa7b2c3d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,9 @@
2004-01-15 JP Rosevear <jpr@ximian.com>
+ * main.c (kill_dataserver): kill the correct binary, tidy includes
+
+2004-01-15 JP Rosevear <jpr@ximian.com>
+
* main.c (detect_version): move version detection here
* e-config-upgrade.c: remove it from here; clean out all the
diff --git a/shell/Evolution-Component.idl b/shell/Evolution-Component.idl
index e199629066..dc23fc40be 100644
--- a/shell/Evolution-Component.idl
+++ b/shell/Evolution-Component.idl
@@ -65,7 +65,7 @@ module Evolution {
/* Pop up a new editing dialog for the item with the specified
@item_type_name. */
void requestCreateItem (in string item_type_name)
- raises (UnknownType);
+ raises (UnknownType, Failed);
/*** URI handling (e.g. for the command-line, "evolution
diff --git a/shell/main.c b/shell/main.c
index 6fc007c6e8..e3eff9b1e9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -20,7 +20,9 @@
* Author: Ettore Perazzoli
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-util/e-dialog-utils.h"
#include "e-util/e-gtk-utils.h"
@@ -28,7 +30,6 @@
#include "e-icon-factory.h"
#include "e-shell-constants.h"
-#include "e-shell-window.h" /* FIXME */
#include "e-shell.h"
@@ -178,7 +179,7 @@ kill_dataserver (void)
g_print ("(Killing old version of evolution-data-server...)\n");
system (KILL_PROCESS_CMD " -9 lt-evolution-data-server 2> /dev/null");
- system (KILL_PROCESS_CMD " -9 evolution-data-server 2> /dev/null");
+ system (KILL_PROCESS_CMD " -9 evolution-data-server-1.0 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");