diff options
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.c | 8 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/notify-main.c | 5 |
3 files changed, 16 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f4cc95776a..0e6181fda3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2005-02-28 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-28 JP Rosevear <jpr@novell.com> * gui/gnome-cal.c (gnome_calendar_goto_today): revert fix for diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index f37ccad139..31864ec9eb 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -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); diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index c679ad41e5..1032f5b42b 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -158,12 +158,11 @@ 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 (); |