1 |
ssuominen 11/02/05 12:20:11 |
2 |
|
3 |
Added: nm-applet-0.8.2-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/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: nm-applet-0.8.2-libnotify-0.7.patch |
16 |
=================================================================== |
17 |
--- src/applet.c |
18 |
+++ src/applet.c |
19 |
@@ -58,6 +58,10 @@ |
20 |
#include <gnome-keyring.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 "applet.h" |
28 |
#include "applet-device-wired.h" |
29 |
#include "applet-device-wifi.h" |
30 |
@@ -626,12 +630,20 @@ |
31 |
escaped = utils_escape_notify_message (message); |
32 |
notify = notify_notification_new (summary, |
33 |
escaped, |
34 |
- icon ? icon : GTK_STOCK_NETWORK, |
35 |
- NULL); |
36 |
+ icon ? icon : GTK_STOCK_NETWORK |
37 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
38 |
+ ); |
39 |
+#else |
40 |
+ , NULL); |
41 |
+#endif |
42 |
g_free (escaped); |
43 |
applet->notification = notify; |
44 |
|
45 |
+#if NOTIFY_CHECK_VERSION (0, 7, 0) |
46 |
+ /* notify_notification_attach_to_status_icon was removed */ |
47 |
+#else |
48 |
notify_notification_attach_to_status_icon (notify, applet->status_icon); |
49 |
+#endif |
50 |
notify_notification_set_urgency (notify, urgency); |
51 |
notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); |