From 60939de9ba741af0dc99c141fbf951dba8061f60 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 10 Aug 2004 14:14:43 +0000 Subject: disconnect from signals also when using only the system tray. Fixes a 2004-08-10 Rodrigo Moya * gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb): disconnect from signals also when using only the system tray. Fixes a crash when removing an event that had an alarm popup recently. svn path=/trunk/; revision=26862 --- calendar/ChangeLog | 6 ++++++ calendar/gui/alarm-notify/alarm-queue.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2c7594b6df..48820d50e9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2004-08-10 Rodrigo Moya + + * gui/alarm-notify/alarm-queue.c (tray_icon_destroyed_cb): disconnect + from signals also when using only the system tray. Fixes a crash when + removing an event that had an alarm popup recently. + 2004-08-09 Rodrigo Moya * gui/e-calendar-view.c: re-added 'Make this occurrence movable' menu diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 74c16746c4..08d3033dcb 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -768,6 +768,9 @@ tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data) { TrayIconData *tray_data = user_data; + g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, on_dialog_objs_removed_cb, NULL); + if (tray_data->cqa != NULL) remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE); -- cgit v1.2.3