diff options
author | 2011-02-05 12:20:11 +0000 | |
---|---|---|
committer | 2011-02-05 12:20:11 +0000 | |
commit | 7ed4fc4343758840dd49b8c05352eae1a0a688e4 (patch) | |
tree | 2eb68f7df2db32697a28ff4b3ca27536eb19ccdb /gnome-extra/nm-applet/files | |
parent | Mask USE="test" for x11-libs/libnotify because of x11-libs/gtk+:3 requirement. (diff) | |
download | gentoo-2-7ed4fc4343758840dd49b8c05352eae1a0a688e4.tar.gz gentoo-2-7ed4fc4343758840dd49b8c05352eae1a0a688e4.tar.bz2 gentoo-2-7ed4fc4343758840dd49b8c05352eae1a0a688e4.zip |
Fix building with x11-libs/libnotify >= 0.7.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/nm-applet/files')
-rw-r--r-- | gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch new file mode 100644 index 000000000000..54aa473af98a --- /dev/null +++ b/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch @@ -0,0 +1,36 @@ +--- src/applet.c ++++ src/applet.c +@@ -58,6 +58,10 @@ + #include <gnome-keyring.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "applet.h" + #include "applet-device-wired.h" + #include "applet-device-wifi.h" +@@ -626,12 +630,20 @@ + escaped = utils_escape_notify_message (message); + notify = notify_notification_new (summary, + escaped, +- icon ? icon : GTK_STOCK_NETWORK, +- NULL); ++ icon ? icon : GTK_STOCK_NETWORK ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + g_free (escaped); + applet->notification = notify; + ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ /* notify_notification_attach_to_status_icon was removed */ ++#else + notify_notification_attach_to_status_icon (notify, applet->status_icon); ++#endif + notify_notification_set_urgency (notify, urgency); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); + |