Merge lp:~ubuntu-branches/ubuntu/lucid/liferea/lucid-201003041913 into lp:ubuntu/lucid/liferea

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/liferea now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/liferea/lucid-201003041913. A merge should be performed if necessary.

=== added file 'debian/patches/notification-append'
--- debian/patches/notification-append	1970-01-01 00:00:00 +0000
+++ debian/patches/notification-append	2010-03-04 19:17:18 +0000
@@ -0,0 +1,44 @@
+diff -ur liferea-1.6.0-rc6/src/notification/libnotify.c liferea-ted/src/notification/libnotify.c
+--- liferea-1.6.0-rc6/src/notification/libnotify.c	2009-06-20 13:33:19.000000000 -0500
++++ liferea-ted/src/notification/libnotify.c	2009-09-10 23:00:39.000000000 -0500
+@@ -44,6 +44,7 @@
+ #include "notification/notification.h"
+ 
+ static gboolean supports_actions = FALSE;
++static gboolean supports_append  = FALSE;
+ 
+ static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) {
+ 	g_assert(action != NULL);
+@@ -188,7 +189,11 @@
+ 			for (c = caps; c != NULL; c = c->next) {
+ 				if (g_str_equal ((char*)c->data, "actions")) {
+ 					supports_actions = TRUE;
+-					break;
++					continue;
++				}
++				if (g_str_equal ((char*)c->data, "append")) {
++					supports_append = TRUE;
++					continue;
+ 				}
+ 			}
+ 			g_list_foreach (caps, (GFunc)g_free, NULL);
+@@ -242,12 +247,16 @@
+ 	if (item_count == 0)
+ 		return;
+ 
+-	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
++	labelSummary_p = g_strdup_printf (ngettext ("<b>%s</b> has <b>%d</b> update", "<b>%s</b> has <b>%d</b> updates", item_count), 
+ 	                                  node_get_title (node), item_count);
+-	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
++	n = notify_notification_new ( _("Feed Update"), labelSummary_p, "liferea", NULL);
+ 	g_free(labelSummary_p);
+ 
+-	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
++	if (supports_append) {
++		notify_notification_set_hint_string(n, "append", "allow");
++	} else {
++		notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
++	}
+ 	notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
+ 	if (supports_actions) {
+ 		notify_notification_add_action (n, "show_details", _("Show details"),

=== renamed file 'debian/patches/notification-append' => 'debian/patches/notification-append.moved'