Re: [evolution-patches] Session manage evolution-wombat

[Rodrigo Moya <rodrigo ximian com>]

On Fri, 2003-10-24 at 00:22, Rodney Dawes wrote:
> I don't like this patch. It adds the need of a display for wombat.
>
right, I don't like it neither, since we dont want the wombat to depend
on a display. Attached is a modified patch of the alarm notify part of
your patch, including the bonobo_main_quit call, and a
bonobo_object_unref on the alarm_notify_service.

Please test this patch.

cheers

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802.2.35
diff -u -p -r1.1802.2.35 ChangeLog
--- ChangeLog	8 Oct 2003 09:32:06 -0000	1.1802.2.35
+++ ChangeLog	24 Oct 2003 07:59:39 -0000
@@ -1,3 +1,8 @@
+2003-10-24  Rodrigo Moya <rodrigo ximian com>
+
+	* gui/alarm-notify/notify-main.c (client_die_cb): use
+	bonobo_main_quit, not gtk_main_quit.
+
 2003-10-08  Harry Lu  <harry lu sun com>
 
 	* gui/dialogs/alarm-options.glade: Make repeat-quantity and 
Index: gui/alarm-notify/notify-main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/notify-main.c,v
retrieving revision 1.25.4.2
diff -u -p -r1.25.4.2 notify-main.c
--- gui/alarm-notify/notify-main.c	22 Aug 2003 15:23:35 -0000	1.25.4.2
+++ gui/alarm-notify/notify-main.c	24 Oct 2003 07:59:40 -0000
@@ -34,7 +34,6 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <bonobo-activation/bonobo-activation.h>
-#include <gtk/gtkmain.h>
 #include "alarm.h"
 #include "alarm-queue.h"
 #include "alarm-notify.h"
@@ -55,7 +54,7 @@ static AlarmNotify *alarm_notify_service
 static void
 client_die_cb (GnomeClient *client)
 {
-	gtk_main_quit ();
+	bonobo_main_quit ();
 }
 
 /* Sees if a session manager is present.  If so, it tells the SM how to restart
@@ -193,10 +192,11 @@ main (int argc, char **argv)
 	bonobo_object_unref (BONOBO_OBJECT (factory));
 	factory = NULL;
 
-	/* FIXME: free the alarm_notify_service */
-
 	alarm_queue_done ();
 	alarm_done ();
+
+	if (alarm_notify_service)
+		bonobo_object_unref (BONOBO_OBJECT (alarm_notify_service));
 
 	gnome_sound_shutdown ();
 	gnome_vfs_shutdown ();