[gentoo-commits] gentoo-x86 commit in net-irc/conspire/files: conspire-1.0.1-libnotify-0.7.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/02/05 17:38:40

  Added:                conspire-1.0.1-libnotify-0.7.patch
  Log:
  Fix building with x11-libs/libnotify >= 0.7. Enable USE="gnutls" by default until #339204 is solved.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-irc/conspire/files/conspire-1.0.1-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/files/conspire-1.0.1-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/files/conspire-1.0.1-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: conspire-1.0.1-libnotify-0.7.patch
===================================================================
--- src/fe-gtk/tray.c
+++ src/fe-gtk/tray.c
@@ -16,6 +16,9 @@
 #include <gtk/gtk.h>
 #ifndef _WIN32
 # include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
 #endif
 
 typedef enum	/* current icon status */
@@ -134,8 +137,13 @@
 		return;
 
 	stext = strip_color(text, -1, STRIP_ALL);
-	n = notify_notification_new(title, stext, NULL, NULL);
+	n = notify_notification_new(title, stext, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+	);
+#else
+	, NULL);
 	notify_notification_attach_to_status_icon(n, sticon);
+#endif
 	notify_notification_set_timeout(n, 20000);
 	notify_notification_show(n, NULL);