Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/xchat/files: xchat-2.8.8-libnotify07.patch
Date: Sun, 30 Jan 2011 09:32:33
Message-Id: 20110130093222.4D31420057@flycatcher.gentoo.org
1 polynomial-c 11/01/30 09:32:22
2
3 Added: xchat-2.8.8-libnotify07.patch
4 Log:
5 Added support for >=libnotify-0.7
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-irc/xchat/files/xchat-2.8.8-libnotify07.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/xchat/files/xchat-2.8.8-libnotify07.patch?rev=1.1&content-type=text/plain
14
15 Index: xchat-2.8.8-libnotify07.patch
16 ===================================================================
17 diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
18 --- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500
19 +++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500
20 @@ -125,8 +125,9 @@ static void *nn_mod = NULL;
21 /* prototypes */
22 static gboolean (*nn_init) (char *);
23 static void (*nn_uninit) (void);
24 -static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
25 -static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
26 +/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
27 + * extra NULL argument will be fine */
28 +static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
29 static gboolean (*nn_show) (void *noti, GError **error);
30 static void (*nn_set_timeout) (void *noti, gint timeout);
31
32 @@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
33 goto bad;
34 if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
35 goto bad;
36 - if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
37 - goto bad;
38 if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
39 goto bad;
40 if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
Report Message
Find on MARC Find on Google Groups