Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-voip/sflphone/files: sflphone-0.9.8.4-libnotify-0.7.patch
Date: Sun, 30 Jan 2011 14:08:05
Message-Id: 20110130140755.D57D920054@flycatcher.gentoo.org
1 ssuominen 11/01/30 14:07:55
2
3 Added: sflphone-0.9.8.4-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 net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: sflphone-0.9.8.4-libnotify-0.7.patch
16 ===================================================================
17 --- sflphone-client-gnome/src/sflnotify.c
18 +++ sflphone-client-gnome/src/sflnotify.c
19 @@ -30,6 +30,10 @@
20
21 #include <sflnotify.h>
22
23 +#ifndef NOTIFY_CHECK_VERSION
24 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
25 +#endif
26 +
27 GnomeNotification *_gnome_notification;
28
29 void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urgency, gint timeout, GnomeNotification **notif)
30 @@ -43,12 +47,20 @@
31 notify_init ("SFLphone");
32
33 // Set struct fields
34 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
35 + _notif->notification = notify_notification_new (title, body, NULL);
36 +#else
37 _notif->notification = notify_notification_new (title, body, NULL, NULL);
38 +#endif
39 //_notif->icon = gdk_pixbuf_new_from_file_at_size (LOGO, 120, 120, NULL);
40 _notif->icon = gdk_pixbuf_new_from_file (LOGO_SMALL, NULL);
41 #if GTK_CHECK_VERSION(2,10,0)
42 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
43 + // notify_notification_attach_to_status_icon function was removed
44 +#else
45 notify_notification_attach_to_status_icon (_notif->notification , get_status_icon() );
46 #endif
47 +#endif
48
49 notify_notification_set_urgency (_notif->notification, urgency);