[evolution-patches] Re: patch for alarm daemon (#72928)

[Rodrigo Moya <rodrigo novell com>]

Sorry, wrong patch, now the good one.

On Wed, 2005-02-23 at 18:55 +0100, Rodrigo Moya wrote:
-- 
Rodrigo Moya <rodrigo novell com>

? gui/dialogs/event-page.gladep
? gui/dialogs/task-page.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2672
diff -u -p -r1.2672 ChangeLog
--- ChangeLog	23 Feb 2005 12:42:43 -0000	1.2672
+++ ChangeLog	23 Feb 2005 17:59:29 -0000
@@ -1,3 +1,12 @@
+2005-02-23  Rodrigo Moya <rodrigo novell com>
+
+	Fixes #72928
+
+	* gui/alarm-notify/notify-main.c (main): don't call alarm_queue_done...
+
+	* gui/alarm-notify/alarm-notify.c (alarm_notify_finalize): ...do it at
+	the same level than alarm_queue_init.
+
 2005-02-23  Chenthill Palanisamy  <pchenthill novell com>
 
 	Fixes #72006	
Index: gui/alarm-notify/alarm-notify.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify.c,v
retrieving revision 1.46
diff -u -p -r1.46 alarm-notify.c
--- gui/alarm-notify/alarm-notify.c	18 Feb 2005 13:33:01 -0000	1.46
+++ gui/alarm-notify/alarm-notify.c	23 Feb 2005 17:59:29 -0000
@@ -57,8 +57,8 @@ static BonoboObjectClass *parent_class;
 
 BONOBO_TYPE_FUNC_FULL(AlarmNotify, GNOME_Evolution_Calendar_AlarmNotify, BONOBO_TYPE_OBJECT, alarm_notify)
 
-     /* Class initialization function for the alarm notify service */
-     static void
+/* Class initialization function for the alarm notify service */
+static void
 alarm_notify_class_init (AlarmNotifyClass *klass)
 {
 	GObjectClass *object_class;
@@ -261,7 +261,9 @@ alarm_notify_finalize (GObject *object)
 		g_hash_table_foreach (priv->uri_client_hash[i], dequeue_client, NULL);
 		g_hash_table_destroy (priv->uri_client_hash[i]);
 	}
-	
+
+	alarm_queue_done ();
+
 	g_mutex_free (priv->mutex);
 	g_free (priv);
 
Index: gui/alarm-notify/notify-main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/notify-main.c,v
retrieving revision 1.43
diff -u -p -r1.43 notify-main.c
--- gui/alarm-notify/notify-main.c	18 May 2004 13:33:40 -0000	1.43
+++ gui/alarm-notify/notify-main.c	23 Feb 2005 17:59:29 -0000
@@ -158,11 +158,10 @@ main (int argc, char **argv)
 	bonobo_object_unref (BONOBO_OBJECT (factory));
 	factory = NULL;
 
-	alarm_queue_done ();
-	alarm_done ();
-
 	if (alarm_notify_service)
 		bonobo_object_unref (BONOBO_OBJECT (alarm_notify_service));
+
+	alarm_done ();
 
 	e_passwords_shutdown ();
 	gnome_sound_shutdown ();