|
Owen W. Taylor |
08a899e |
diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
|
|
Owen W. Taylor |
08a899e |
--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500
|
|
Owen W. Taylor |
08a899e |
+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500
|
|
Owen W. Taylor |
08a899e |
@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
|
|
Owen W. Taylor |
08a899e |
/* prototypes */
|
|
Owen W. Taylor |
08a899e |
static gboolean (*nn_init) (char *);
|
|
Owen W. Taylor |
08a899e |
static void (*nn_uninit) (void);
|
|
Owen W. Taylor |
08a899e |
-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
|
|
Owen W. Taylor |
08a899e |
-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
|
|
Owen W. Taylor |
08a899e |
+/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
|
|
Owen W. Taylor |
08a899e |
+ * extra NULL argument will be fine */
|
|
Owen W. Taylor |
08a899e |
+static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
|
|
Owen W. Taylor |
08a899e |
static gboolean (*nn_show) (void *noti, GError **error);
|
|
Owen W. Taylor |
08a899e |
static void (*nn_set_timeout) (void *noti, gint timeout);
|
|
Owen W. Taylor |
08a899e |
|
|
Owen W. Taylor |
08a899e |
@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
|
|
Owen W. Taylor |
08a899e |
goto bad;
|
|
Owen W. Taylor |
08a899e |
if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
|
|
Owen W. Taylor |
08a899e |
goto bad;
|
|
Owen W. Taylor |
08a899e |
- if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
|
|
Owen W. Taylor |
08a899e |
- goto bad;
|
|
Owen W. Taylor |
08a899e |
if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
|
|
Owen W. Taylor |
08a899e |
goto bad;
|
|
Owen W. Taylor |
08a899e |
if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
|