Ubuntu
liferea package

Merge lp:~ted/ubuntu/lucid/liferea/notification-append into lp:ubuntu/lucid/liferea

  1. Lucid (10.04)
  2. notification-append
  3. Merge into lucid
Proposed by Ted Gould
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
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Ubuntu branches Pending
Review via email: mp+19050@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Notification append patch

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

modified to corresponds to trunk and merged

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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+liferea (1.6.2-1ubuntu3) lucid; urgency=low
6+
7+ * debian/patches/notification-append: Add patch to make the notification
8+ use the append feature of notify-osd. (LP: #457869)
9+
10+ -- Ted Gould <ted@ubuntu.com> Wed, 10 Feb 2010 14:16:11 -0600
11+
12 liferea (1.6.2-1ubuntu2) lucid; urgency=low
13
14 * debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain
15
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+diff -ur liferea-1.6.0-rc6/src/notification/libnotify.c liferea-ted/src/notification/libnotify.c
21+--- liferea-1.6.0-rc6/src/notification/libnotify.c 2009-06-20 13:33:19.000000000 -0500
22++++ liferea-ted/src/notification/libnotify.c 2009-09-10 23:00:39.000000000 -0500
23+@@ -44,6 +44,7 @@
24+ #include "notification/notification.h"
25+
26+ static gboolean supports_actions = FALSE;
27++static gboolean supports_append = FALSE;
28+
29+ static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) {
30+ g_assert(action != NULL);
31+@@ -188,7 +189,11 @@
32+ for (c = caps; c != NULL; c = c->next) {
33+ if (g_str_equal ((char*)c->data, "actions")) {
34+ supports_actions = TRUE;
35+- break;
36++ continue;
37++ }
38++ if (g_str_equal ((char*)c->data, "append")) {
39++ supports_append = TRUE;
40++ continue;
41+ }
42+ }
43+ g_list_foreach (caps, (GFunc)g_free, NULL);
44+@@ -242,12 +247,16 @@
45+ if (item_count == 0)
46+ return;
47+
48+- labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count),
49++ 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+ node_get_title (node), item_count);
51+- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
52++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, "liferea", NULL);
53+ g_free(labelSummary_p);
54+
55+- notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
56++ if (supports_append) {
57++ notify_notification_set_hint_string(n, "append", "allow");
58++ } else {
59++ notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
60++ }
61+ notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
62+ if (supports_actions) {
63+ notify_notification_add_action (n, "show_details", _("Show details"),
64
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 01_ubuntu_feedlists
70 fix_systray_behavior
71 add_X-Ubuntu-Gettext-Domain
72+notification-append

Subscribers

People subscribed via source and target branches

to all changes: