rpms/evolution/devel evolution-2.5.5.1-notification-cleanups.patch, NONE, 1.1 evolution.spec, 1.118, 1.119

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30690

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.5.5.1-notification-cleanups.patch 
Log Message:
add missing patch


evolution-2.5.5.1-notification-cleanups.patch:
 alarm-queue.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

--- NEW FILE evolution-2.5.5.1-notification-cleanups.patch ---
--- evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api	2006-01-16 09:42:17.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c	2006-01-26 08:29:13.000000000 -0500
@@ -1459,11 +1459,13 @@
 	const char *summary, *location;
 	GtkTooltips *tooltips;
 	ECalComponentText text;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
+	char *start_str, *end_str, *alarm_str, *time_str;
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
 	char *filename;
 	char *body;
+	GdkPixbuf *icon;
+	NotifyNotification *n;
 	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -1471,7 +1473,7 @@
 		return;
 	if (!notify_is_initted ())
 		notify_init("Evolution Alarm Notify");
-	GdkPixbuf *icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
+	icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
 	g_free (filename);
 	
 	/* get a sensible description for the event */
@@ -1495,9 +1497,6 @@
 	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
 	time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
 
-	str = g_strdup_printf ("%s %s",
-			       start_str, time_str);
-
 	if (organiser.cn) {
 		if (location)
 			body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
@@ -1509,21 +1508,25 @@
 			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
 		else
 			body = g_strdup_printf ("%s %s", start_str, time_str);			
-}
+	}
+
+	n = notify_notification_new (summary, body, "", NULL);
+	if (icon) {
+	        notify_notification_set_icon_data_from_pixbuf (n, icon);
+		g_object_unref (G_OBJECT (icon));
+	}
 
-	NotifyNotification *n = notify_notification_new (summary, body, "", NULL);
-	notify_notification_set_icon_data_from_pixbuf (n, icon);
-	if (!notify_notification_show(n, NULL))
-	    g_warning ("Could not send notification to daemon\n");	
+ 	/* Notifications don't timeout: require explicit user action: */
+ 	notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
 
-	/* create the private structure */
+	if (!notify_notification_show_and_forget (n, NULL))
+	        g_warning ("Could not send notification to daemon\n");
+
+	g_free (body);
 	g_free (start_str);
 	g_free (end_str);
 	g_free (alarm_str);
 	g_free (time_str);
-	g_free (str);
-
-
 }
 #endif
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- evolution.spec	27 Jan 2006 23:58:18 -0000	1.118
+++ evolution.spec	28 Jan 2006 05:14:10 -0000	1.119
@@ -38,7 +38,7 @@
 
 Name: evolution
 Version: 2.5.5.1
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -625,6 +625,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-2
+- added missing patch
+
 * Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
 - 2.5.5.1
 - update patch 106 to track upstream, renaming from