fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 05:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn: merge branch 'th/vpn-disconnect-rh1442064'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1442064

(cherry picked from commit 6e67f7f30b)
This commit is contained in:
Thomas Haller 2017-04-15 00:31:34 +02:00
commit 0a3fdf6604
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/vpn/nm-vpn-connection.c
View file

@ -358,21 +358,6 @@ disconnect_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
g_object_unref (user_data);
}
static void
call_plugin_disconnect (NMVpnConnection *self)
{
NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
g_dbus_proxy_call (priv->proxy,
"Disconnect",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
priv->cancellable,
(GAsyncReadyCallback) disconnect_cb,
g_object_ref (self));
}
static void
fw_call_cleanup (NMVpnConnection *self)
{
@ -646,7 +631,17 @@ _set_vpn_state (NMVpnConnection *self,
}
/* Tear down and clean up the connection */
call_plugin_disconnect (self);
if (priv->proxy) {
g_dbus_proxy_call (priv->proxy,
"Disconnect",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
priv->cancellable,
(GAsyncReadyCallback) disconnect_cb,
g_object_ref (self));
}
vpn_cleanup (self, parent_dev);
/* fall through */
default: