[network-manager-applet/nma-1-2] c-e: unregister signal handler from VPN plugin



commit b65eb51d0f1e4ca57195b910150d1e4fa5a4dfb8
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 23:20:11 2016 +0200

    c-e: unregister signal handler from VPN plugin
    
    (cherry picked from commit a35d46624709df5690ff70f40ca8546d56b6e460)

 src/connection-editor/page-vpn.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index d07f491..76b2f3b 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -132,7 +132,7 @@ ce_page_vpn_can_export (CEPageVpn *page)
 {
        CEPageVpnPrivate *priv = CE_PAGE_VPN_GET_PRIVATE (page);
 
-       return  (nm_vpn_editor_plugin_get_capabilities (priv->plugin) & 
NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT) != 0;
+       return (nm_vpn_editor_plugin_get_capabilities (priv->plugin) & 
NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT) != 0;
 }
 
 static gboolean
@@ -154,7 +154,10 @@ dispose (GObject *object)
 {
        CEPageVpnPrivate *priv = CE_PAGE_VPN_GET_PRIVATE (object);
 
-       g_clear_object (&priv->editor);
+       if (priv->editor) {
+               g_signal_handlers_disconnect_by_func (priv->editor, G_CALLBACK (vpn_plugin_changed_cb), 
object);
+               g_clear_object (&priv->editor);
+       }
        g_clear_pointer (&priv->service_type, g_free);
 
        G_OBJECT_CLASS (ce_page_vpn_parent_class)->dispose (object);


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