Bug#622363: transition: libnotify 0.7

[Sjoerd Simons <sjoerd@luon.net>]

On Mon, 2011-08-01 at 22:11 +0200, Yves-Alexis Perez wrote:
> So it doesn't look really good, I guess those were fixed somehow in 3.0
> branch, but as 2.32 is starting to be a bit old, I'm not really sure
> there's much support on that, and especially not on --enable-gtk3=yes.
> 
> I'll try a bit more tomorrow, but I guess that means entangling to that
> evolution transition (or removing evolution from testing, but that might
> be a nightmare too?)

Seems best to patch the current evolution in unstable. Attached is a
patch that makes it compile, but i haven't tested it any further.

Good luck!
-- 
Sjoerd Simons <sjoerd@luon.net>

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index e407ca3..821bb80 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 			body = g_strdup_printf ("%s %s", start_str, time_str);
 	}
 
-	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
+	n = notify_notification_new (summary, body, "stock_appointment-reminder");
 	if (!notify_notification_show(n, NULL))
 	    g_warning ("Could not send notification to daemon\n");
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index a46af56..e1cbe1f 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -564,9 +564,7 @@ new_notify_status (EMEventTargetFolder *t)
 
 			notify  = notify_notification_new (
 				_("New email"), safetext,
-				"mail-unread", NULL);
-			notify_notification_attach_to_status_icon (
-				notify, status_icon);
+				"mail-unread");
 
 			/* Check if actions are supported */
 			if (can_support_actions ()) {
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index d30a9b1..8d6ec3c 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -150,8 +150,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text)
 				return;
 			}
 
-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
-			notify_notification_attach_to_status_icon (notify, status_icon);
+			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
 			g_timeout_add (500, show_notify_cb, NULL);