[gentoo-commits] gentoo-x86 commit in gnome-extra/zenity/files: zenity-2.32.1-libnotify-0.7.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/02/05 13:49:01

  Added:                zenity-2.32.1-libnotify-0.7.patch
  Log:
  Fix building with x11-libs/libnotify >= 0.7.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: zenity-2.32.1-libnotify-0.7.patch
===================================================================
--- src/notification.c
+++ src/notification.c
@@ -30,6 +30,9 @@
 
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
 #endif
 
 #include "zenity.h"
@@ -184,10 +187,14 @@
             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
           }
 
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+          /* notify_notification_new_with_status_icon was removed */
+#else
           notif = notify_notification_new_with_status_icon (
                               message[0] /* title */,
                               message[1] /* summary */,
                               icon, status_icon);
+#endif
 
           g_strfreev (message);
           g_free (freeme);