diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-24 15:47:03 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-24 15:48:28 +0200 |
| commit | c9080d0f488ecabe52fa11751e8271b9b3da166e (patch) | |
| tree | 2f212fa3f06cc011db072db4e457318b5f6d68a7 | |
| parent | da6dfc03f719cf9f05dfe6b277351571b0bd516c (diff) | |
| download | NetworkManager-c9080d0f488ecabe52fa11751e8271b9b3da166e.tar.gz | |
fixup! vpn-manager: support multiple VPN connections of the same type
| -rw-r--r-- | libnm-core/nm-vpn-plugin-info.c | 3 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-manager.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index d8ead9a220..28f0f69279 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -449,9 +449,6 @@ nm_vpn_plugin_info_list_add (GSList **list, NMVpnPluginInfo *plugin_info, GError gboolean nm_vpn_plugin_info_list_remove (GSList **list, NMVpnPluginInfo *plugin_info) { - if (!plugin_info) - return FALSE; - g_return_val_if_fail (list, FALSE); g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (plugin_info), FALSE); diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index a0dd6efd2f..f7bda8df27 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -273,10 +273,8 @@ dispose (GObject *object) g_clear_object (&priv->monitor_lib); } - while (priv->plugins) { - NMVpnPluginInfo *plugin_info = priv->plugins->data; - nm_vpn_plugin_info_list_remove (&priv->plugins, plugin_info); - } + while (priv->plugins) + nm_vpn_plugin_info_list_remove (&priv->plugins, priv->plugins->data); g_hash_table_unref (priv->active_services); |