File liferea-libnotify07.patch of Package liferea

Overview Repositories Revisions Requests Users Attributes Meta

File liferea-libnotify07.patch of Package liferea

Index: liferea-1.6.6/configure.ac
===================================================================
--- liferea-1.6.6.orig/configure.ac
+++ liferea-1.6.6/configure.ac
@@ -77,7 +77,7 @@ 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],enable_libnotify=yes,enable_libnotify=no)
    AC_SUBST(LIBNOTIFY_CFLAGS)
    AC_SUBST(LIBNOTIFY_LIBS)
 else
Index: liferea-1.6.6/src/notification/libnotify.c
===================================================================
--- liferea-1.6.6.orig/src/notification/libnotify.c
+++ liferea-1.6.6/src/notification/libnotify.c
@@ -43,6 +43,10 @@
 
 #include "notification/notification.h"
 
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 static gboolean supports_actions = FALSE;
 
 static void notif_libnotify_callback_open ( NotifyNotification *n, gchar *action, gpointer user_data ) {
@@ -150,8 +154,12 @@ static void notif_libnotify_callback_sho
 //		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");
@@ -244,7 +252,12 @@ notif_libnotify_node_has_new_items (node
 
 	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));

Places

File liferea-libnotify07.patch of Package liferea

Places