diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /libnm/nm-vpn-connection.c | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'libnm/nm-vpn-connection.c')
| -rw-r--r-- | libnm/nm-vpn-connection.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index 4b96210b..a91a6f69 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -30,7 +30,7 @@ #include "nm-active-connection.h" #include "nm-dbus-helpers.h" -#include "nmdbus-vpn-connection.h" +#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h" G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION) @@ -79,7 +79,7 @@ nm_vpn_connection_get_banner (NMVpnConnection *vpn) if (priv->vpn_state != NM_VPN_CONNECTION_STATE_ACTIVATED) return NULL; - return priv->banner; + return nm_str_not_empty (priv->banner); } /** @@ -144,6 +144,7 @@ init_dbus (NMObject *object) proxy = _nm_object_get_proxy (object, NM_DBUS_INTERFACE_VPN_CONNECTION); g_signal_connect (proxy, "vpn-state-changed", G_CALLBACK (vpn_state_changed_proxy), object); + g_object_unref (proxy); } static void @@ -185,10 +186,6 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class) g_type_class_add_private (connection_class, sizeof (NMVpnConnectionPrivate)); - _nm_object_class_add_interface (nm_object_class, NM_DBUS_INTERFACE_VPN_CONNECTION); - _nm_dbus_register_proxy_type (NM_DBUS_INTERFACE_VPN_CONNECTION, - NMDBUS_TYPE_VPN_CONNECTION_PROXY); - /* virtual methods */ object_class->get_property = get_property; object_class->finalize = finalize; |