/pidgin/main: 7f7d87c04ab1: Add g_signal_handlers_disconnect_by_...

[Ankit Vani]

Changeset: 7f7d87c04ab116ba497c7e0caaa3cb0a5f3eb669
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-28 02:07 +0530
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/7f7d87c04ab1

Description:

Add g_signal_handlers_disconnect_by_data to glibcompat.h and use it

diffstat:

 libpurple/glibcompat.h |  4 ++++
 pidgin/gtkconv.c       |  3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (27 lines):

diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -49,6 +49,10 @@
 #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #define G_GNUC_END_IGNORE_DEPRECATIONS
 
+#define g_signal_handlers_disconnect_by_data(instance, data) \
+	g_signal_handlers_disconnect_matched((instance), G_SIGNAL_MATCH_DATA, \
+			0, 0, NULL, NULL, (data))
+
 static inline GThread * g_thread_try_new(const gchar *name, GThreadFunc func,
 	gpointer data, GError **error)
 {
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -9846,8 +9846,7 @@ notebook_remove_tab_from_menu_cb(GtkNote
 	GtkWidget *item;
 
 	/* Disconnecting the "child-notify::menu-label" signal. */
-	g_signal_handlers_disconnect_matched(child, G_SIGNAL_MATCH_DATA, 0, 0,
-			NULL, NULL, notebook);
+	g_signal_handlers_disconnect_by_data(child, notebook);
 
 	item = g_object_get_data(G_OBJECT(child), "popup-menu-item");
 	gtk_container_remove(GTK_CONTAINER(win->notebook_menu), item);