diff options
| author | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-11-07 13:52:24 +0800 |
| commit | 200606f92810d3de322e5ee96f8326e1a656f8bb (patch) | |
| tree | da0dc27f5311128dcb6e7eb6400931e45743372e /shell/main.c | |
| parent | e5472b4cc9a4bb80b89437a16f8b77943ea35555 (diff) | |
| download | gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.gz gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.tar.zst gsoc2013-evolution-200606f92810d3de322e5ee96f8326e1a656f8bb.zip | |
Various changes to merge in evolution-data-server reliance.
svn path=/trunk/; revision=23206
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/main.c b/shell/main.c index 6d84090840..8a6d011cb6 100644 --- a/shell/main.c +++ b/shell/main.c @@ -60,7 +60,7 @@ #include <glade/glade.h> #include "e-config-upgrade.h" -#include "Evolution-Wombat.h" +#include "Evolution-DataServer.h" #ifdef GTKHTML_HAVE_GCONF #include <gconf/gconf.h> @@ -178,20 +178,20 @@ kill_wombat (void) static void kill_old_wombat (void) { - GNOME_Evolution_WombatInterfaceCheck iface; + GNOME_Evolution_DataServer_InterfaceCheck iface; CORBA_Environment ev; CORBA_char *version; CORBA_exception_init (&ev); - iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Wombat_InterfaceCheck", 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { kill_wombat (); CORBA_exception_free (&ev); return; } - version = GNOME_Evolution_WombatInterfaceCheck__get_interfaceVersion (iface, &ev); + version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev); if (BONOBO_EX (&ev)) { kill_wombat (); CORBA_Object_release (iface, &ev); |