1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
diff -NrU5 liferea-1.6.6b.original/configure.ac liferea-1.6.6b/configure.ac
--- liferea-1.6.6b.original/configure.ac 2011-06-22 09:16:24.000000000 -0600
+++ liferea-1.6.6b/configure.ac 2011-08-08 09:21:49.000000000 -0600
@@ -75,11 +75,11 @@
dnl *********
dnl libnotify
dnl *********
if test "x$enable_libnotify" = "xyes"; then
- PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify <= 0.5],enable_libnotify=yes,enable_libnotify=no)
+ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify <= 0.7.3],enable_libnotify=yes,enable_libnotify=no)
AC_SUBST(LIBNOTIFY_CFLAGS)
AC_SUBST(LIBNOTIFY_LIBS)
else
enable_libnotify=no
fi
diff -NrU5 liferea-1.6.6b.original/src/notification/libnotify.c liferea-1.6.6b/src/notification/libnotify.c
--- liferea-1.6.6b.original/src/notification/libnotify.c 2011-06-22 07:25:40.000000000 -0600
+++ liferea-1.6.6b/src/notification/libnotify.c 2011-08-08 09:21:11.000000000 -0600
@@ -26,10 +26,14 @@
#include <gtk/gtk.h>
#include <glib.h>
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
#include "common.h"
#include "conf.h"
#include "debug.h"
#include "node.h"
#include "item.h"
@@ -148,11 +152,16 @@
if(node_p) {
// notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
// notify_notification_clear_actions(n);
- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
+ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ );
+#else
+ , NULL);
+#endif
notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
notify_notification_set_category (n, "feed");
@@ -242,11 +251,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),
node_get_title (node), item_count);
- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ );
+#else
+ , NULL);
+#endif
g_free(labelSummary_p);
notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
if (supports_actions) {
|
GitWeb
