diff options
| author | Ross Burton <rburton@src.gnome.org> | 2003-11-24 01:29:05 +0800 |
|---|---|---|
| committer | Ross Burton <rburton@src.gnome.org> | 2003-11-24 01:29:05 +0800 |
| commit | 515d9aaeb26d164dacc3fe0450b3b51fa1c04054 (patch) | |
| tree | 290a13b5d45277d4bae5eb21a0517ac43e384874 | |
| parent | 780358463e9d18bccc5342c276a33ca8702cff26 (diff) | |
| download | gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar.gz gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar.bz2 gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar.lz gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar.xz gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.tar.zst gsoc2013-evolution-515d9aaeb26d164dacc3fe0450b3b51fa1c04054.zip | |
Update OAFIID of AlarmNotify
svn path=/trunk/; revision=23470
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in | 2 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/notify-main.c | 2 | ||||
| -rw-r--r-- | calendar/gui/main.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9036cb7f28..033816c4ea 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2003-11-23 Ross Burton <ross@burtonini.com> + + * gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in: + Append "_2" to the OAFIID to avoid conflicting with Evo 1.4. + + * gui/main.c: + * gui/alarm-notify/notify-main.c: + Updated with new OAFIID. + 2003-11-20 JP Rosevear <jpr@ximian.com> * Remove a bunch of gal includes that are no longer needed diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in index 24e5d88ed9..b5620db42c 100644 --- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in +++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify" +<oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2" type="exe" location="@LIBEXECDIR@/evolution-alarm-notify"> diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 8e492386fa..f50118ba47 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -160,7 +160,7 @@ main (int argc, char **argv) gnome_sound_init ("localhost"); - factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", + factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2", (BonoboFactoryCallback) alarm_notify_factory_fn, NULL); if (!factory) g_error (_("Could not create the alarm notify service factory")); diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 4c9fa25ba6..1e76b65580 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -99,7 +99,7 @@ launch_alarm_daemon_cb (gpointer data) /* activate the alarm daemon */ CORBA_exception_init (&ev); - an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &ev); + an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_2", 0, NULL, &ev); if (BONOBO_EX (&ev)) { g_message ("launch_alarm_daemon_cb(): Could not activate the alarm notification service"); |