callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill the right thing (kill_old_dataserver): rename and check the version

Browse Source 
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
This commit is contained in:
JP Rosevear 2003-11-11 18:43:09 +00:00 committed by JP Rosevear
parent 6f57f92231
commit b24eaafcb8
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-11 JP Rosevear <jpr@ximian.com>
* configure.in: determine the e-d-s version, version the gettext
files properly
2003-11-07 Dan Winship <danw@ximian.com> 2003-11-07 Dan Winship <danw@ximian.com>
* configure.in (AC_OUTPUT): Remove e-util/ename/Makefile * configure.in (AC_OUTPUT): Remove e-util/ename/Makefile

11
configure.in
View File

@ -49,7 +49,7 @@ AC_PROG_INTLTOOL
ALL_LINGUAS="am az be bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW" ALL_LINGUAS="am az be bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
GETTEXT_PACKAGE=evolution-1.4 GETTEXT_PACKAGE=evolution-1.5
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
@ -1199,14 +1199,15 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.
AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS) AC_SUBST(EVOLUTION_MAIL_LIBS)
dnl -- evolution-data-server IDL dnl -- evolution-data-server IDL and version
AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`pkg-config --modversion evolution-data-server-1.0`", evolution-data-server version)
AC_MSG_CHECKING(for evolution-data-server IDL) AC_MSG_CHECKING(for evolution-data-server IDL)
DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.0`/Evolution-DataServer.idl DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.0`/Evolution-DataServer.idl
echo $DATASERVER_IDL
if test -f "$DATASERVER_IDL"; then if test -f "$DATASERVER_IDL"; then
AC_MSG_RESULT($DATASERVER_IDL) AC_MSG_RESULT($DATASERVER_IDL)
AC_SUBST(DATASERVER_IDL) AC_SUBST(DATASERVER_IDL)
else else
AC_MSG_ERROR(no) AC_MSG_ERROR(no)
fi fi

9
shell/ChangeLog
View File

@ -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> 2003-11-10 Ettore Perazzoli <ettore@ximian.com>
* main.c: Added a new "-c" command-line arg. * main.c: Added a new "-c" command-line arg.
@ -43,6 +48,10 @@
* e-component-registry.h (struct _EComponentInfo): New member * e-component-registry.h (struct _EComponentInfo): New member
"alias". "alias".
2003-11-07 JP Rosevear <jpr@ximian.com>
* Makefile.am: don't include top level libical
2003-11-07 JP Rosevear <jpr@ximian.com> 2003-11-07 JP Rosevear <jpr@ximian.com>
* Makefile.am: make sure the marshal header is in the sources too * Makefile.am: make sure the marshal header is in the sources too

20
shell/main.c
View File

@ -165,19 +165,19 @@ shell_weak_notify (void *data,
#ifdef KILL_PROCESS_CMD #ifdef KILL_PROCESS_CMD
static void 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 lt-evolution-data-server 2> /dev/null");
system (KILL_PROCESS_CMD " -9 evolution-wombat 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 lt-evolution-alarm-notify 2> /dev/null");
system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null"); system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null");
} }
static void static void
kill_old_wombat (void) kill_old_dataserver (void)
{ {
GNOME_Evolution_DataServer_InterfaceCheck iface; GNOME_Evolution_DataServer_InterfaceCheck iface;
CORBA_Environment ev; 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); iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev);
if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) {
kill_wombat (); kill_dataserver ();
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
return; return;
} }
version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev); version = GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion (iface, &ev);
if (BONOBO_EX (&ev)) { if (BONOBO_EX (&ev)) {
kill_wombat (); kill_dataserver ();
CORBA_Object_release (iface, &ev); CORBA_Object_release (iface, &ev);
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
return; return;
} }
if (strcmp (version, VERSION) != 0) { if (strcmp (version, DATASERVER_VERSION) != 0) {
CORBA_free (version); CORBA_free (version);
kill_wombat (); kill_dataserver ();
CORBA_Object_release (iface, &ev); CORBA_Object_release (iface, &ev);
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
return; return;
@ -352,7 +352,7 @@ idle_cb (void *data)
gboolean displayed_any; gboolean displayed_any;
#ifdef KILL_PROCESS_CMD #ifdef KILL_PROCESS_CMD
kill_old_wombat (); kill_old_dataserver ();
#endif #endif
CORBA_exception_init (&ev); CORBA_exception_init (&ev);