diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-24 15:59:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-24 16:04:59 +0200 |
| commit | 0c0dc533e9fa318bdfd4e0ed5c5e66c43a04c8fa (patch) | |
| tree | 7736054817b6dd6371d5f9335bf67845ccfe884c | |
| parent | 6e411339dceda7a3b045dcffc96f9c051529c88e (diff) | |
| download | NetworkManager-0c0dc533e9fa318bdfd4e0ed5c5e66c43a04c8fa.tar.gz | |
fixup! vpn-manager: support multiple VPN connections of the same type
nm_vpn_connection_activate() does have it's use, because it's the
gatekeeper to avoid activating multiple connection for old plugins.
nm_vpn_connection_deactivate() doesn't seem any useful.
| -rw-r--r-- | src/nm-manager.c | 3 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-manager.c | 8 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-manager.h | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index d19155e7c4..2d826b8547 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3461,7 +3461,6 @@ nm_manager_deactivate_connection (NMManager *manager, NMDeviceStateReason reason, GError **error) { - NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); NMActiveConnection *active; gboolean success = FALSE; @@ -3477,7 +3476,7 @@ nm_manager_deactivate_connection (NMManager *manager, if (reason == NM_DEVICE_STATE_REASON_CONNECTION_REMOVED) vpn_reason = NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED; - if (nm_vpn_manager_deactivate_connection (priv->vpn_manager, NM_VPN_CONNECTION (active), vpn_reason)) + if (nm_vpn_connection_deactivate (NM_VPN_CONNECTION (active), vpn_reason, FALSE)) success = TRUE; else g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index cd80a1e9d4..f39ddf6c11 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -121,14 +121,6 @@ nm_vpn_manager_activate_connection (NMVpnManager *manager, return TRUE; } -gboolean -nm_vpn_manager_deactivate_connection (NMVpnManager *self, - NMVpnConnection *connection, - NMVpnConnectionStateReason reason) -{ - return nm_vpn_connection_deactivate (connection, reason, FALSE); -} - /******************************************************************************/ static void diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 2034e077ad..f557e27acb 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -48,8 +48,4 @@ gboolean nm_vpn_manager_activate_connection (NMVpnManager *manager, NMVpnConnection *vpn, GError **error); -gboolean nm_vpn_manager_deactivate_connection (NMVpnManager *manager, - NMVpnConnection *connection, - NMVpnConnectionStateReason reason); - #endif /* __NETWORKMANAGER_VPN_MANAGER_H__ */ |