[evolution-patches] Alarm Snooze Crash

[JP Rosevear <jpr novell com>]

If you click once, it sets up the snooze, but the dialog stays.
Clicking again causes a crash.

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? 2412.patch
? 41624.patch
? 68707.patch
? 70000.patch
? bar.patch
? ccp.patch
? context.patch
? meeting-autocomplete.patch
? output.pdf
? print-cal.patch
? snooze.patch
? twentyfour.patch
? gui/menu.patch
? gui/non-cursor.patch
? gui/temp.patch
? gui/dialogs/alarm-dialog.gladep
? gui/dialogs/cal-prefs-dialog.gladep
? gui/dialogs/task-details-page.gladep
? gui/dialogs/task-page.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2685
diff -u -r1.2685 ChangeLog
--- ChangeLog	11 Mar 2005 12:02:47 -0000	1.2685
+++ ChangeLog	13 Mar 2005 20:01:35 -0000
@@ -1,3 +1,9 @@
+2005-03-13  JP Rosevear  <jpr novell com>
+
+	* gui/alarm-notify/alarm-queue.c (notify_dialog_cb): make sure in
+	the snooze case the tray (and via callbacks then) the dialog is
+	destroyed
+
 2005-03-11  Sushma Rai  <rsushma novell com>
 
 	* gui/dialogs/event-page.c (event_page_show_options): Removed the check
Index: calendar-errors.xml.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/calendar-errors.xml.h,v
retrieving revision 1.9
diff -u -r1.9 calendar-errors.xml.h
--- calendar-errors.xml.h	5 Feb 2005 11:55:02 -0000	1.9
+++ calendar-errors.xml.h	13 Mar 2005 20:01:35 -0000
@@ -143,4 +143,4 @@
 /* calendar:server-version primary */
 char *s = N_("Your server needs to be updated");
 /* calendar:server-version secondary */
-char *s = N_(" Some features may not work correctly with your current server version");
+char *s = N_(" Some features may not work correctly with your current server version ");
Index: gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.159
diff -u -r1.159 calendar-commands.c
--- gui/calendar-commands.c	1 Feb 2005 11:46:33 -0000	1.159
+++ gui/calendar-commands.c	13 Mar 2005 20:01:36 -0000
@@ -454,6 +454,7 @@
 	t = e_cal_menu_target_new_select(menu, model, events);
 	if (!enable)
 		t->target.mask = ~0;
+	g_message ("%s", enable ? "Enabled" : "Not enabled");
 
 	sensitize_items(uic, calendar_sensitize_table, t->target.mask);
 #if 0
@@ -547,11 +548,13 @@
 	g_assert (focus != NULL);
 
 	if (in) {
+		g_message ("Focus in");
 		g_signal_connect (gcal, "calendar_selection_changed",
 				  G_CALLBACK (gcal_calendar_selection_changed_cb), control);
 		calendar_control_sensitize_calendar_commands (control, gcal, TRUE);
 		focus->calendar_focused = TRUE;
 	} else if (focus->calendar_focused) {
+		g_message ("Focus out");
 		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),
 					       G_CALLBACK (gcal_calendar_selection_changed_cb),
 					       control);
@@ -638,7 +641,8 @@
 			   GnomeCalendar *gcal)
 {
 	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
+	
+BonoboUIComponent *uic;
 	FocusData *focus;
 
 	uic = bonobo_control_get_ui_component (control);
Index: gui/e-cal-menu.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-menu.c,v
retrieving revision 1.3
diff -u -r1.3 e-cal-menu.c
--- gui/e-cal-menu.c	1 Feb 2005 15:51:26 -0000	1.3
+++ gui/e-cal-menu.c	13 Mar 2005 20:01:36 -0000
@@ -176,6 +176,8 @@
 		if (!read_only)
 			mask &= ~E_CAL_MENU_SELECT_EDITABLE;
 
+		g_message ("Checking client - %s", read_only ? "not editable" : "editable");
+
 		if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
 		    && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
 			mask &= ~E_CAL_MENU_SELECT_ASSIGNABLE;
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.80
diff -u -r1.80 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	4 Mar 2005 14:39:13 -0000	1.80
+++ gui/alarm-notify/alarm-queue.c	13 Mar 2005 20:01:36 -0000
@@ -761,7 +761,7 @@
 	case ALARM_NOTIFY_SNOOZE:
 		create_snooze (tray_data->cqa, tray_data->alarm_id, snooze_mins);
 		tray_data->cqa = NULL;
-		return;
+		break;
 
 	case ALARM_NOTIFY_EDIT:
 		edit_component (tray_data->client, tray_data->comp);