diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-08 19:04:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-08 19:04:13 +0000 |
| commit | 72e4bd778c6203ddf91229bcf6d6132086de0ac2 (patch) | |
| tree | 8d84590edb847d8a415a0b7126e385d14a9c737f /gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch | |
| parent | Version bump. (diff) | |
| download | gentoo-2-72e4bd778c6203ddf91229bcf6d6132086de0ac2.tar.gz gentoo-2-72e4bd778c6203ddf91229bcf6d6132086de0ac2.tar.bz2 gentoo-2-72e4bd778c6203ddf91229bcf6d6132086de0ac2.zip | |
Fix building with x11-libs/libnotify >= 0.7 wrt #354117 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch')
| -rw-r--r-- | gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch new file mode 100644 index 000000000000..f2b889ec0324 --- /dev/null +++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch @@ -0,0 +1,53 @@ +--- battstat/battstat_applet.c ++++ battstat/battstat_applet.c +@@ -42,6 +42,9 @@ + + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif + + #include "battstat.h" +@@ -435,7 +438,12 @@ + GTK_ICON_LOOKUP_USE_BUILTIN, + NULL); + +- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet); ++ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , applet); ++#endif + + /* XXX: it would be nice to pass this as a named icon */ + notify_notification_set_icon_from_pixbuf (n, icon); +--- gweather/gweather-applet.c ++++ gweather/gweather-applet.c +@@ -30,6 +30,9 @@ + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> + #include <libnotify/notification.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE +@@ -471,8 +474,12 @@ + if (icon == NULL) + icon = "stock-unknown"; + +- n = notify_notification_new (message, detail, icon, +- gw_applet->container); ++ n = notify_notification_new (message, detail, icon ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , gw_applet->container); ++#endif + + notify_notification_show (n, &error); + if (error) |