vpn: inline call_plugin_disconnect()
There is only one caller. Don't bother moving the logic to a separate function.
This commit is contained in:
@@ -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,8 +631,17 @@ _set_vpn_state (NMVpnConnection *self,
|
||||
}
|
||||
|
||||
/* Tear down and clean up the connection */
|
||||
if (priv->proxy)
|
||||
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:
|
||||
|
Reference in New Issue
Block a user