[network-manager-applet: 3/6] wireless-security: disconnect all handlers upon EAPMethodSimple destroy

[Beniamino Galvani <bgalvani src gnome org>]

commit 4ce98c0d59388f4ed38b55b118dddb847bbad34d
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Thu Dec 22 18:04:58 2016 +0100

    wireless-security: disconnect all handlers upon EAPMethodSimple destroy

 src/wireless-security/eap-method-simple.c |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index feee1b8..b4ee792 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -269,23 +269,14 @@ destroy (EAPMethod *parent)
 
        widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook"));
        g_assert (widget);
+       g_signal_handlers_disconnect_by_data (widget, method);
 
-       g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
-                                             (GCallback) widgets_realized,
-                                             method);
-       g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
-                                             (GCallback) widgets_unrealized,
-                                             method);
+       g_signal_handlers_disconnect_by_data (method->username_entry, method->ws_parent);
+       g_signal_handlers_disconnect_by_data (method->password_entry, method->ws_parent);
+       g_signal_handlers_disconnect_by_data (method->password_entry, method);
+       g_signal_handlers_disconnect_by_data (method->show_password, method);
 
-       widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry"));
-       g_assert (widget);
-       g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
-                                             (GCallback) password_storage_changed,
-                                             method);
-       if (method->idle_func_id > 0) {
-               g_source_remove (method->idle_func_id);
-               method->idle_func_id = 0;
-       }
+       nm_clear_g_source (&method->idle_func_id);
 }
 
 EAPMethodSimple *