Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-color-manager/files: gnome-color-manager-2.32.0-libnotify-0.7.patch
Date: Sat, 05 Feb 2011 13:31:27
Message-Id: 20110205133115.7322820057@flycatcher.gentoo.org
1 ssuominen 11/02/05 13:31:15
2
3 Added: gnome-color-manager-2.32.0-libnotify-0.7.patch
4 Log:
5 Fix building with x11-libs/libnotify >= 0.7.
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: gnome-color-manager-2.32.0-libnotify-0.7.patch
16 ===================================================================
17 --- src/gcm-session.c
18 +++ src/gcm-session.c
19 @@ -28,6 +28,10 @@
20 #include <gconf/gconf-client.h>
21 #include <libnotify/notify.h>
22
23 +#ifndef NOTIFY_CHECK_VERSION
24 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
25 +#endif
26 +
27 #include "egg-debug.h"
28 #include "gcm-dbus.h"
29 #include "gcm-client.h"
30 @@ -145,7 +149,12 @@
31 NotifyNotification *notification;
32
33 /* show a bubble */
34 - notification = notify_notification_new (title, message, GCM_STOCK_ICON, NULL);
35 + notification = notify_notification_new (title, message, GCM_STOCK_ICON
36 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
37 + );
38 +#else
39 + , NULL);
40 +#endif
41 notify_notification_set_timeout (notification, GCM_SESSION_NOTIFY_TIMEOUT);
42 notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);