diff options
| author | JP Rosevear <jpr@ximian.com> | 2003-11-12 02:43:09 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-11-12 02:43:09 +0800 |
| commit | b24eaafcb868b3fb1f0f0fa1bf93c6640160d203 (patch) | |
| tree | b5da1e08f5471cfb21a4d14bc15142238ad63b54 /shell | |
| parent | 6f57f92231266e6b194cf630851d4ac481cd43c1 (diff) | |
| download | gsoc2013-evolution-b24eaafcb868b3fb1f0f0fa1bf93c6640160d203.tar.gz gsoc2013-evolution-b24eaafcb868b3fb1f0f0fa1bf93c6640160d203.tar.zst gsoc2013-evolution-b24eaafcb868b3fb1f0f0fa1bf93c6640160d203.zip | |
kill the right thing (kill_old_dataserver): rename and check the version
2003-11-11 JP Rosevear <jpr@ximian.com>
* main.c (kill_dataserver): kill the right thing
(kill_old_dataserver): rename and check the version correctly
2003-11-11 JP Rosevear <jpr@ximian.com>
* configure.in: determine the e-d-s version, version the gettext
files properly
svn path=/trunk/; revision=23288
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/main.c | 20 |
2 files changed, 19 insertions, 10 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 0212982d6f..bc8031d33a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2003-11-11 JP Rosevear <jpr@ximian.com> + + * main.c (kill_dataserver): kill the right thing + (kill_old_dataserver): rename and check the version correctly + 2003-11-10 Ettore Perazzoli <ettore@ximian.com> * main.c: Added a new "-c" command-line arg. @@ -45,6 +50,10 @@ 2003-11-07 JP Rosevear <jpr@ximian.com> + * Makefile.am: don't include top level libical + +2003-11-07 JP Rosevear <jpr@ximian.com> + * Makefile.am: make sure the marshal header is in the sources too 2003-11-07 JP Rosevear <jpr@ximian.com> diff --git a/shell/main.c b/shell/main.c index 3c7e3678ee..6743a22cc4 100644 --- a/shell/main.c +++ b/shell/main.c @@ -165,19 +165,19 @@ shell_weak_notify (void *data, #ifdef KILL_PROCESS_CMD static void -kill_wombat (void) +kill_dataserver (void) { - g_print ("(Killing old version of Wombat...)\n"); + g_print ("(Killing old version of evolution-data-server...)\n"); - 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-data-server 2> /dev/null"); + system (KILL_PROCESS_CMD " -9 evolution-data-server 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_wombat (void) +kill_old_dataserver (void) { GNOME_Evolution_DataServer_InterfaceCheck iface; CORBA_Environment ev; @@ -187,22 +187,22 @@ kill_old_wombat (void) iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { - kill_wombat (); + kill_dataserver (); CORBA_exception_free (&ev); return; } version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev); if (BONOBO_EX (&ev)) { - kill_wombat (); + kill_dataserver (); CORBA_Object_release (iface, &ev); CORBA_exception_free (&ev); return; } - if (strcmp (version, VERSION) != 0) { + if (strcmp (version, DATASERVER_VERSION) != 0) { CORBA_free (version); - kill_wombat (); + kill_dataserver (); CORBA_Object_release (iface, &ev); CORBA_exception_free (&ev); return; @@ -352,7 +352,7 @@ idle_cb (void *data) gboolean displayed_any; #ifdef KILL_PROCESS_CMD - kill_old_wombat (); + kill_old_dataserver (); #endif CORBA_exception_init (&ev); |