[evolution-patches] patch for #62392

[Rodrigo Moya <rodrigo novell com>]

Patch for evolution 2.0 for bug http://bugzilla.ximian.com/show_bug.cgi?
id=62392 (Crash on close alarm notification).
-- 
Rodrigo Moya <rodrigo novell com>

? gui/apps_evolution_calendar-2.0.schemas
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2500
diff -u -p -r1.2500 ChangeLog
--- ChangeLog	28 Aug 2004 15:08:44 -0000	1.2500
+++ ChangeLog	31 Aug 2004 14:44:35 -0000
@@ -1,3 +1,11 @@
+2004-08-31  Rodrigo Moya <rodrigo novell com>
+
+	Fixes #62392
+
+	* gui/alarm-notify/alarm-queue.c (display_notification): ref the
+	client's query object so that it doesn't disappear on us.
+	(tray_icon_destroyed_cb): unref the query previously ref'ed.
+
 2004-08-28  JP Rosevear  <jpr novell com>
 
 	* gui/e-itip-control.c (rsvp_clicked_cb): get the active state
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.71
diff -u -p -r1.71 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	28 Aug 2004 15:08:44 -0000	1.71
+++ gui/alarm-notify/alarm-queue.c	31 Aug 2004 14:44:36 -0000
@@ -802,6 +802,7 @@ tray_icon_destroyed_cb (GtkWidget *tray,
 
 	g_object_unref (tray_data->comp);
 	g_object_unref (tray_data->client);
+	g_object_unref (tray_data->query);
 
 	tray_icons_list = g_list_remove (tray_icons_list, tray_data);
 	g_free (tray_data);
@@ -975,7 +976,6 @@ display_notification (time_t trigger, Co
 	/* create the tray icon */
 	tooltips = gtk_tooltips_new ();
 
-	/* FIXME: Use stock image equivalent when it becomes available */
 	tray_icon = egg_tray_icon_new (qa->instance->auid);
 	pixbuf = e_icon_factory_get_icon  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
 	image = gtk_image_new_from_pixbuf (pixbuf);
@@ -1011,7 +1011,7 @@ display_notification (time_t trigger, Co
 	tray_data->alarm_id = alarm_id;
 	tray_data->comp = e_cal_component_clone (comp);
 	tray_data->client = cqa->parent_client->client;
-	tray_data->query = cqa->parent_client->query;
+	tray_data->query = g_object_ref (cqa->parent_client->query);
 	tray_data->image = image;
 	tray_data->blink_state = FALSE;
 	g_object_ref (tray_data->client);