pidgin/pidgin

Add g_signal_handlers_disconnect_by_data to glibcompat.h and use it

2014-01-28, Ankit Vani
7f7d87c04ab1
Parents 9a0203562da5
Children 4e8497f23b7c
Add g_signal_handlers_disconnect_by_data to glibcompat.h and use it
2 files changed, 5 insertions(+), 2 deletions(-)
  • +4 -0
    libpurple/glibcompat.h
  • +1 -2
    pidgin/gtkconv.c
    • --- a/libpurple/glibcompat.h Mon Jan 27 17:27:53 2014 +0530
    +++ b/libpurple/glibcompat.h Tue Jan 28 02:07:10 2014 +0530
    @@ -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)
    {
    --- a/pidgin/gtkconv.c Mon Jan 27 17:27:53 2014 +0530
    +++ b/pidgin/gtkconv.c Tue Jan 28 02:07:10 2014 +0530
    @@ -9846,8 +9846,7 @@
    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);