[Evolution-hackers] Patch to change AlarmNotify OAFIID

[Ross Burton <ross burtonini com>]

Hi,

Attached is a patch to change the OAFIID of the AlarmNotify daemon. 
This is required as otherwise the calendar starts "AlarmNotify", which
is provided by both Evo1.4 and 1.5.  For me this results in the Evo1.4
AlarmNotify process starting, which starts Wombat, which breaks the
addressbook.

Ross
-- 
Ross Burton                                 mail: ross burtonini com
                                          jabber: ross burtonini com
                                     www: http://www.burtonini.com./
 PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF

Index: gui/main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/main.c,v
retrieving revision 1.160
diff -u -r1.160 main.c
--- gui/main.c	17 Nov 2003 13:13:13 -0000	1.160
+++ gui/main.c	23 Nov 2003 15:59:13 -0000
@@ -99,7 +99,7 @@
 
 	/* 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");
Index: gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in,v
retrieving revision 1.3
diff -u -r1.3 GNOME_Evolution_Calendar_AlarmNotify.server.in.in
--- gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in	17 Nov 2003 13:13:13 -0000	1.3
+++ gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in	23 Nov 2003 15:59:13 -0000
@@ -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">
 
Index: gui/alarm-notify/notify-main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/notify-main.c,v
retrieving revision 1.30
diff -u -r1.30 notify-main.c
--- gui/alarm-notify/notify-main.c	17 Nov 2003 13:13:13 -0000	1.30
+++ gui/alarm-notify/notify-main.c	23 Nov 2003 15:59:13 -0000
@@ -160,7 +160,7 @@
 
 	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"));