[evolution-patches] patch for crash in alarm daemon



yesterday, when using only the system tray for testing my fix for
#62030, found a crash happening when you dismiss an alarm from the
system tray icons menu, and then remove later that event. It crashed
because the on_dialog_objs_removed_cb was still being called. This fixes
that.
-- 
Rodrigo Moya <rodrigo novell com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2477
diff -u -p -r1.2477 ChangeLog
--- ChangeLog	6 Aug 2004 10:05:23 -0000	1.2477
+++ ChangeLog	6 Aug 2004 11:19:57 -0000
@@ -1,3 +1,9 @@
+2004-08-06  Rodrigo Moya <rodrigo novell com>
+
+	* 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-05  Parthasarathi S A   <sparthasarathi novell com>
 
 	Fix for bug #61673.
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.68
diff -u -p -r1.68 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	6 Aug 2004 09:48:52 -0000	1.68
+++ gui/alarm-notify/alarm-queue.c	6 Aug 2004 11:19:58 -0000
@@ -768,6 +768,9 @@ tray_icon_destroyed_cb (GtkWidget *tray,
 {
 	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);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]