diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-05-23 16:24:52 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-05-23 16:24:52 +0800 |
| commit | d356dc440b03da31a182bfee7ee6698e4cf8ae1c (patch) | |
| tree | 7407d3fd86bb0be1b1c4c6f9f90bf4fbef7080b5 /calendar/gui/alarm-notify/alarm-queue.c | |
| parent | 3178f3556778fc34d801c8032ae0a525c8cb1563 (diff) | |
| download | gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar.gz gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar.bz2 gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar.lz gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar.xz gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.tar.zst gsoc2013-evolution-d356dc440b03da31a182bfee7ee6698e4cf8ae1c.zip | |
More alarm fixes
svn path=/trunk/; revision=32015
Diffstat (limited to 'calendar/gui/alarm-notify/alarm-queue.c')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 9b27990f4b..25745d4fb0 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -192,6 +192,7 @@ static void remove_client_alarms (ClientAlarms *ca); static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp); static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa); static void tray_list_remove_cqa (CompQueuedAlarms *cqa); +static void on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data); /* Alarm queue engine */ @@ -708,7 +709,7 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) if (!found) { d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %d\n",__FILE__, __LINE__, ca->client)); - tray_list_remove_cqa (lookup_comp_queued_alarms (ca, l->data)); + tray_list_remove_cqa (lookup_comp_queued_alarms (ca, id)); remove_comp (ca, id); g_hash_table_remove (ca->uid_alarms_hash, id); e_cal_component_free_id (id); @@ -719,7 +720,7 @@ query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) cqa = lookup_comp_queued_alarms (ca, id); if (!cqa) { - d(printf("%s:%d (query_objects_changed_async) - No currently queued alarms for %s\n",__FILE__, __LINE__, id->uid)); + d(printf("%s:%d (query_objects_changed_async) - No currently queued alarms for %s\n",__FILE__, __LINE__, id->uid)); add_component_alarms (ca, alarms); g_object_unref (comp); comp = NULL; @@ -970,6 +971,8 @@ free_tray_icon_data (TrayIconData *tray_data) g_object_unref (tray_data->client); tray_data->client = NULL; + g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, on_dialog_objs_removed_cb, NULL); g_object_unref (tray_data->query); tray_data->query = NULL; |