1
=== modified file 'debian/changelog'
2
--- debian/changelog	2010-02-10 08:31:45 +0000
3
+++ debian/changelog	2010-02-10 20:30:42 +0000
4
@@ -1,3 +1,10 @@
5
1
liferea (1.6.2-1ubuntu3) lucid; urgency=low
6
2
7
3
  * debian/patches/notification-append: Add patch to make the notification
8
4
    use the append feature of notify-osd. (LP: #457869)
9
5
10
6
 -- Ted Gould <ted@ubuntu.com>  Wed, 10 Feb 2010 14:16:11 -0600
11
7
12
1
liferea (1.6.2-1ubuntu2) lucid; urgency=low
8
liferea (1.6.2-1ubuntu2) lucid; urgency=low
13
2
9
14
3
  * debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain
10
  * debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain
15
4
11
16
=== added file 'debian/patches/notification-append'
17
--- debian/patches/notification-append	1970-01-01 00:00:00 +0000
18
+++ debian/patches/notification-append	2010-02-10 20:30:42 +0000
19
@@ -0,0 +1,44 @@
20
1
diff -ur liferea-1.6.0-rc6/src/notification/libnotify.c liferea-ted/src/notification/libnotify.c
21
2
--- liferea-1.6.0-rc6/src/notification/libnotify.c	2009-06-20 13:33:19.000000000 -0500
22
3
+++ liferea-ted/src/notification/libnotify.c	2009-09-10 23:00:39.000000000 -0500
23
4
@@ -44,6 +44,7 @@
24
5
 #include "notification/notification.h"
25
6
 
26
7
 static gboolean supports_actions = FALSE;
27
8
+static gboolean supports_append  = FALSE;
28
9
 
29
10
 static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) {
30
11
 	g_assert(action != NULL);
31
12
@@ -188,7 +189,11 @@
32
13
 			for (c = caps; c != NULL; c = c->next) {
33
14
 				if (g_str_equal ((char*)c->data, "actions")) {
34
15
 					supports_actions = TRUE;
35
16
-					break;
36
17
+					continue;
37
18
+				}
38
19
+				if (g_str_equal ((char*)c->data, "append")) {
39
20
+					supports_append = TRUE;
40
21
+					continue;
41
22
 				}
42
23
 			}
43
24
 			g_list_foreach (caps, (GFunc)g_free, NULL);
44
25
@@ -242,12 +247,16 @@
45
26
 	if (item_count == 0)
46
27
 		return;
47
28
 
48
29
-	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
49
30
+	labelSummary_p = g_strdup_printf (ngettext ("<b>%s</b> has <b>%d</b> update", "<b>%s</b> has <b>%d</b> updates", item_count), 
50
31
 	                                  node_get_title (node), item_count);
51
32
-	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
52
33
+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, "liferea", NULL);
53
34
 	g_free(labelSummary_p);
54
35
 
55
36
-	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
56
37
+	if (supports_append) {
57
38
+		notify_notification_set_hint_string(n, "append", "allow");
58
39
+	} else {
59
40
+		notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
60
41
+	}
61
42
 	notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
62
43
 	if (supports_actions) {
63
44
 		notify_notification_add_action (n, "show_details", _("Show details"),
64
0
45
65
=== modified file 'debian/patches/series'
66
--- debian/patches/series	2010-02-10 08:31:45 +0000
67
+++ debian/patches/series	2010-02-10 20:30:42 +0000
68
@@ -7,3 +7,4 @@
69
7
01_ubuntu_feedlists
7
01_ubuntu_feedlists
70
8
fix_systray_behavior
8
fix_systray_behavior
71
9
add_X-Ubuntu-Gettext-Domain
9
add_X-Ubuntu-Gettext-Domain
72
10
notification-append
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~ted/ubuntu/lucid/liferea/notification-append
Merge into:	lp:ubuntu/lucid/liferea
Diff against target:	72 lines (+52/-0) 3 files modified debian/changelog (+7/-0) debian/patches/notification-append (+44/-0) debian/patches/series (+1/-0)
To merge this branch:	bzr merge lp:~ted/ubuntu/lucid/liferea/notification-append
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Didier Roche-Tolomelli		Approve on 2010-03-04
Ubuntu branches	2010-02-10	Pending
Review via email: mp+19050@code.launchpad.net