[network-manager-applet/bg/macsec: 1/2] revert



commit 28a05d67a65f1e848191a3b2474934ca5858b0c1
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Mon May 29 18:11:57 2017 +0200

    revert

 src/wireless-security/eap-method-leap.c   |    4 +++-
 src/wireless-security/eap-method-simple.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
index 3cf6a26..e6ce5be 100644
--- a/src/wireless-security/eap-method-leap.c
+++ b/src/wireless-security/eap-method-leap.c
@@ -182,6 +182,8 @@ destroy (EAPMethod *parent)
        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->show_password, method);
+
+       wireless_security_unref (method->ws_parent);
 }
 
 EAPMethodLEAP *
@@ -210,7 +212,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
        method = (EAPMethodLEAP *) parent;
        method->password_flags_name = NM_SETTING_802_1X_PASSWORD;
        method->editing_connection = secrets_only ? FALSE : TRUE;
-       method->ws_parent = ws_parent;
+       method->ws_parent = wireless_security_ref (ws_parent);
 
        widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook"));
        g_assert (widget);
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index 66dc421..e81b08f 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -278,6 +278,8 @@ destroy (EAPMethod *parent)
        g_signal_handlers_disconnect_by_data (method->show_password, method);
 
        nm_clear_g_source (&method->idle_func_id);
+
+       wireless_security_unref (method->ws_parent);
 }
 
 EAPMethodSimple *
@@ -306,7 +308,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
 
        method = (EAPMethodSimple *) parent;
        method->password_flags_name = NM_SETTING_802_1X_PASSWORD;
-       method->ws_parent = ws_parent;
+       method->ws_parent = wireless_security_ref (ws_parent);
        method->flags = flags;
        method->type = type;
        g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]