Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/gmpc-libnotify/files: gmpc-libnotify-0.20.0-libnotify-0.7.patch
Date: Sat, 05 Feb 2011 13:10:06
Message-Id: 20110205130957.D1C6820057@flycatcher.gentoo.org
1 ssuominen 11/02/05 13:09:57
2
3 Added: gmpc-libnotify-0.20.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 media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: gmpc-libnotify-0.20.0-libnotify-0.7.patch
16 ===================================================================
17 --- src/plugin.c
18 +++ src/plugin.c
19 @@ -28,6 +28,10 @@
20 #include <gmpc/misc.h>
21 #include <config.h>
22
23 +#ifndef NOTIFY_CHECK_VERSION
24 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
25 +#endif
26 +
27 #define LOG_DOMAIN "LibNotifyPlugin"
28
29 extern GtkStatusIcon *tray_icon2_gsi;
30 @@ -149,15 +153,23 @@
31 if(not == NULL)
32 {
33 // notify_notification_close(not, NULL);
34 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
35 + not = notify_notification_new(summary, buffer,NULL);
36 +#else
37 not = notify_notification_new(summary, buffer,NULL, NULL);
38 +#endif
39 }
40 else{
41 notify_notification_update(not, summary, buffer, NULL);
42 }
43 notify_notification_set_urgency(not, NOTIFY_URGENCY_LOW);
44
45 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
46 + /* notify_notification_attach_to_status_icon was removed */
47 +#else
48 if(cfg_get_single_value_as_int_with_default(config, "libnotify-plugin", "attach-to-tray", TRUE))
49 notify_notification_attach_to_status_icon(not, tray_icon2_gsi);
50 +#endif
51
52 g_free(summary);
53 /* Add the song to the widget */