[evolution/kill-bonobo] Stop killing evolution-data-server services.

[Matthew Barnes <mbarnes src gnome org>]

commit ffde0e37588f47be08eea655a76f0813457889d3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Aug 23 10:41:43 2009 -0400

    Stop killing evolution-data-server services.
    
    That includes startup and --force-shutdown.

 mail/em-composer-prefs.c |    2 -
 shell/Makefile.am        |   20 +------------
 shell/main.c             |   69 ----------------------------------------------
 tools/killev.c           |    1 -
 4 files changed, 1 insertions(+), 91 deletions(-)
---
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 0a7312e..1fd5843 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -37,8 +37,6 @@
 #include "em-composer-prefs.h"
 #include "composer/e-msg-composer.h"
 
-#include <bonobo/bonobo-generic-factory.h>
-
 #include <camel/camel-iconv.h>
 
 #include <misc/e-gui-utils.h>
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 5923bbb..a17c11a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -39,23 +39,6 @@ if NM_SUPPORT
 NM_SUPPORT_FILES = e-shell-nm.c
 endif
 
-# Data Server CORBA stuff
-DATASERVER_IDL_GENERATED_H =			\
-	Evolution-DataServer.h
-
-DATASERVER_IDL_GENERATED_C =			\
-	Evolution-DataServer-common.c		\
-	Evolution-DataServer-skels.c		\
-	Evolution-DataServer-stubs.c
-
-DATASERVER_IDL_GENERATED = $(DATASERVER_IDL_GENERATED_C) $(DATASERVER_IDL_GENERATED_H)
-
-$(DATASERVER_IDL_GENERATED_H): $(DATASERVER_IDL)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(DATASERVER_IDL)
-
-$(DATASERVER_IDL_GENERATED_C): $(DATASERVER_IDL_GENERATED_H)
-
-
 # Shell library
 
 privsolib_LTLIBRARIES =	\
@@ -120,7 +103,6 @@ EVOLUTIONICONRC = evolution-icon.o
 endif
 
 evolution_SOURCES =				\
-	$(DATASERVER_IDL_GENERATED)		\
 	e-config-upgrade.c			\
 	e-config-upgrade.h			\
 	main.c					
@@ -200,7 +182,7 @@ evolution.pure: evolution
 
 endif
 
-BUILT_SOURCES = $(server_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = $(schema_DATA)
diff --git a/shell/main.c b/shell/main.c
index f27961d..43edb73 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -57,17 +57,12 @@
 
 #include <glib/gi18n.h>
 
-#include <bonobo/bonobo-exception.h>
-
-#include <bonobo-activation/bonobo-activation.h>
-
 #include <libedataserver/e-categories.h>
 #include <libedataserverui/e-passwords.h>
 
 #include <glade/glade.h>
 
 #include "e-config-upgrade.h"
-#include "Evolution-DataServer.h"
 
 #include <misc/e-cursors.h>
 #include "e-util/e-error.h"
@@ -112,66 +107,6 @@ static gchar **remaining_args;
 /* Defined in <e-shell.h> */
 extern EShell *default_shell;
 
-#ifdef KILL_PROCESS_CMD
-
-static void
-kill_dataserver (void)
-{
-	g_message ("Killing old version of evolution-data-server...");
-
-	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 evolution-data-server-1.4 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.8 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.10 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.12 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
-kill_old_dataserver (void)
-{
-	GNOME_Evolution_DataServer_InterfaceCheck iface;
-	CORBA_Environment ev;
-	CORBA_char *version;
-
-	CORBA_exception_init (&ev);
-
-	/* FIXME Should we really kill it off?  We also shouldn't hard code the version */
-	iface = bonobo_activation_activate_from_id (
-		(Bonobo_ActivationID) "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev);
-	if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) {
-		kill_dataserver ();
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev);
-	if (BONOBO_EX (&ev)) {
-		kill_dataserver ();
-		CORBA_Object_release (iface, &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	if (strcmp (version, DATASERVER_VERSION) != 0) {
-		CORBA_free (version);
-		kill_dataserver ();
-		CORBA_Object_release (iface, &ev);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_free (version);
-	CORBA_Object_release (iface, &ev);
-	CORBA_exception_free (&ev);
-}
-#endif
-
 static void
 categories_icon_theme_hack (void)
 {
@@ -308,10 +243,6 @@ idle_cb (gchar **uris)
 {
 	EShell *shell;
 
-#ifdef KILL_PROCESS_CMD
-	kill_old_dataserver ();
-#endif
-
 	shell = e_shell_get_default ();
 
 	/* These calls do the right thing when another Evolution
diff --git a/tools/killev.c b/tools/killev.c
index bf8d587..f272602 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -204,7 +204,6 @@ main (gint argc, gchar **argv)
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) kill_component);
 
-	add_matching_repo_id ("IDL:GNOME/Evolution/DataServer/CalFactory:" DATASERVER_API_VERSION);
 	add_matching_iid ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:" BASE_VERSION);
 	g_hash_table_remove_all (components);