rpms/evolution/devel evolution-2.5.4-port-to-new-libnotify-api.patch, 1.1, 1.2 evolution.spec, 1.113, 1.114

Thu Jan 12 23:34:52 UTC 2006

Author: dmalcolm

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

Modified Files:
	evolution-2.5.4-port-to-new-libnotify-api.patch evolution.spec 
Log Message:
* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-7
- updated alarm notification patch(patch 806, #177546, #177666, #177667, 
  #177670)



evolution-2.5.4-port-to-new-libnotify-api.patch:
 alarm-queue.c |   75 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 50 insertions(+), 25 deletions(-)

Index: evolution-2.5.4-port-to-new-libnotify-api.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-port-to-new-libnotify-api.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- evolution-2.5.4-port-to-new-libnotify-api.patch	11 Jan 2006 22:14:37 -0000	1.1
+++ evolution-2.5.4-port-to-new-libnotify-api.patch	12 Jan 2006 23:34:45 -0000	1.2
@@ -1,6 +1,27 @@
---- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api	2006-01-11 14:21:50.000000000 -0500
-+++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c	2006-01-11 14:36:01.000000000 -0500
-@@ -1457,12 +1457,12 @@
+--- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api	2006-01-02 06:38:57.000000000 -0500
++++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c	2006-01-12 18:31:17.000000000 -0500
+@@ -1448,31 +1448,42 @@
+ 	}
+ 
+ #ifdef HAVE_LIBNOTIFY
++static void 
++notify_cb_open_component (NotifyNotification *notification, gchar *user_data)
++{
++        ECal *cal = E_CAL (g_object_get_data( G_OBJECT(notification), "cal"));
++        ECalComponent *comp = E_CAL_COMPONENT (g_object_get_data( G_OBJECT(notification), "comp"));
++
++        edit_component (cal, comp);
++
++        notify_notification_close (notification, NULL);
++}
++
+ static void
+ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
+ 	            gpointer alarm_id, gboolean use_description)
+ {
+ 	QueuedAlarm *qa;
++	ECal *cal;
+ 	ECalComponent *comp;
  	const char *summary, *location;
  	GtkTooltips *tooltips;
  	ECalComponentText text;
@@ -10,24 +31,25 @@
  	ECalComponentOrganizer organiser;
 -	NotifyIcon *icon;
 -	char *filename;
-+	char *icon_filename;
++	GdkPixbuf *icon;
  	char *body;
 +	NotifyNotification *notification;
  	
++	cal = cqa->parent_client->client;
  	comp = cqa->alarms->comp;
  	qa = lookup_queued_alarm (cqa, alarm_id);
-@@ -1470,9 +1470,7 @@
+ 	if (!qa)
  		return;
  	if (!notify_is_initted ())
  		notify_init("Evolution Alarm Notify");
 -	filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
 -	icon = notify_icon_new_from_uri (filename);
 -	g_free (filename);
-+	icon_filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
++	icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
  	
  	/* get a sensible description for the event */
  	e_cal_component_get_summary (comp, &text);
-@@ -1495,9 +1493,6 @@
+@@ -1495,9 +1506,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);
  
@@ -37,7 +59,7 @@
  	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);
-@@ -1508,28 +1503,22 @@
+@@ -1508,28 +1516,45 @@
  		if (location)
  			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
  		else
@@ -45,6 +67,8 @@
 -}
 +		        body = g_strdup_printf ("%s %s", start_str, time_str);			
 +	}
++
++	notification = notify_notification_new (summary, body, "", tray_event_box);
  
 -	if (!notify_send_notification (
 -					NULL, "device", NOTIFY_URGENCY_NORMAL,
@@ -56,15 +80,36 @@
 -					NULL,			/* no user_data */
 -					0))			/* no actions */
 -					g_warning ("Could not send notification to daemon\n");	
-+	notification = notify_notification_new (summary,
-+						body,
-+						icon_filename,
-+						NULL);
-+	if (!notify_notification_show_and_forget (notification, NULL))
-+	        g_warning ("Error showing notification\n");
++	if (icon) {
++		notify_notification_set_icon_data_from_pixbuf (notification, icon);
++	        g_object_unref (G_OBJECT(icon));
++	}
++
++	/* Notifications don't timeout, require explicit user action: */
++	notify_notification_set_timeout (notification, NOTIFY_TIMEOUT_NEVER);
++
++
++	g_object_ref (G_OBJECT(comp));
++	g_object_set_data_full ( G_OBJECT(notification),
++				 "comp",
++				 comp,
++				 g_object_unref);
++
++	g_object_ref (G_OBJECT(cal));
++	g_object_set_data_full ( G_OBJECT(notification),
++				 "cal",
++				 cal,
++				 g_object_unref);	
  
 -	/* create the private structure */
-+	g_free (icon_filename);
++	notify_notification_add_action (notification,
++					"open",
++					_("Open"),
++					notify_cb_open_component);
++
++	if (!notify_notification_show_and_forget (notification, NULL))
++	        g_warning ("Error showing notification\n");
++
 +	g_free (body);
  	g_free (start_str);
  	g_free (end_str);


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- evolution.spec	12 Jan 2006 16:43:48 -0000	1.113
+++ evolution.spec	12 Jan 2006 23:34:45 -0000	1.114
@@ -33,7 +33,7 @@
 
 Name: evolution
 Version: 2.5.4
-Release: 6
+Release: 7
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -510,6 +510,10 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-7
+- updated alarm notification patch(patch 806, #177546, #177666, #177667, 
+  #177670)
+
 * Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> - 2.5.4-6
 - Remove unneeded Requires: notify-daemon
 


