[network-manager-applet/nma-1-2] c-e: take reference to NMVpnEditorPlugin instance in "page-vpn.c"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/nma-1-2] c-e: take reference to NMVpnEditorPlugin instance in "page-vpn.c"
- Date: Mon, 12 Sep 2016 20:33:38 +0000 (UTC)
commit 3e07a324f81df16d8dcd4ebf4540e61f00bc5f87
Author: Thomas Haller <thaller redhat com>
Date: Fri Apr 29 17:33:52 2016 +0200
c-e: take reference to NMVpnEditorPlugin instance in "page-vpn.c"
(cherry picked from commit 801742a796ac2adcee91a6f2458f33a6b73bc725)
src/connection-editor/page-vpn.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 76b2f3b..a373495 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -58,7 +58,7 @@ finish_setup (CEPageVpn *self, gpointer unused, GError *error, gpointer user_dat
if (error)
return;
- g_return_if_fail (priv->plugin != NULL);
+ g_return_if_fail (NM_IS_VPN_EDITOR_PLUGIN (priv->plugin));
priv->editor = nm_vpn_editor_plugin_get_editor (priv->plugin, parent->connection, &vpn_error);
if (!priv->editor) {
@@ -119,6 +119,7 @@ ce_page_vpn_new (NMConnectionEditor *editor,
g_object_unref (self);
return NULL;
}
+ priv->plugin = g_object_ref (priv->plugin);
g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
@@ -160,6 +161,8 @@ dispose (GObject *object)
}
g_clear_pointer (&priv->service_type, g_free);
+ g_clear_object (&priv->plugin);
+
G_OBJECT_CLASS (ce_page_vpn_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]