diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.c | 28 |
2 files changed, 12 insertions, 20 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a344a57ff4..f849f03a18 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,7 @@ +2004-03-01 Dan Winship <danw@ximian.com> + + * gui/alarm-notify/alarm-notify.c: fix rampant double-freeing. + 2004-03-01 Rodrigo Moya <rodrigo@ximian.com> * gui/itip-utils.c (comp_server_send): pass the user list and diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 75d9cb9317..fb18fdc422 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -77,15 +77,11 @@ alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass) } static void -free_client_hash (gpointer key, gpointer value, gpointer user_data) +dequeue_client (gpointer key, gpointer value, gpointer user_data) { - char *uri = key; ECal *client = value; alarm_queue_remove_client (client); - - g_free (uri); - g_object_unref (client); } /* Finalize handler for the alarm notify system */ @@ -101,7 +97,7 @@ alarm_notify_finalize (GObject *object) an = ALARM_NOTIFY (object); priv = an->priv; - g_hash_table_foreach (priv->uri_client_hash, (GHFunc) free_client_hash, NULL); + g_hash_table_foreach (priv->uri_client_hash, dequeue_client, NULL); g_hash_table_destroy (priv->uri_client_hash); g_free (priv); @@ -142,14 +138,8 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data) if (status == E_CALENDAR_STATUS_OK) alarm_queue_add_client (client); else { - gpointer orig_key, orig_value; - - if (g_hash_table_lookup_extended (priv->uri_client_hash, e_cal_get_uri (client), &orig_key, &orig_value)) { - g_hash_table_remove (priv->uri_client_hash, orig_key); - g_free (orig_key); - } - - g_object_unref (client); + g_hash_table_remove (priv->uri_client_hash, + e_cal_get_uri (client)); } } @@ -193,15 +183,13 @@ void alarm_notify_remove_calendar (AlarmNotify *an, const char *str_uri) { AlarmNotifyPrivate *priv; - gpointer orig_key, orig_value; + ECal *client; priv = an->priv; - if (g_hash_table_lookup_extended (priv->uri_client_hash, str_uri, &orig_key, &orig_value)) { - alarm_queue_remove_client (E_CAL (orig_value)); - + client = g_hash_table_lookup (priv->uri_client_hash, str_uri); + if (client) { + alarm_queue_remove_client (client); g_hash_table_remove (priv->uri_client_hash, str_uri); - g_free (orig_key); - g_object_unref (orig_value); } } |