system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 20:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vpn-plugin-info: drop nm_vpn_plugin_info_get_service()

Browse source 
It is not used externally and its use might be confusing and undesired when we
add plugin aliases. The external users should only use the name when idenfiying
the plugin and nm_vpn_plugin_info_list_find_by_service() when matchin the plugin.
This commit is contained in:
Lubomir Rintel 2015-11-01 11:58:49 +01:00
parent ea0e36b61d
commit 3517084b92
4 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libnm-core/nm-vpn-plugin-info.c
View file

@ -526,7 +526,7 @@ nm_vpn_plugin_info_list_find_by_service (GSList *list, const char *service)
g_return_val_if_reached (NULL);
for (iter = list; iter; iter = iter->next) {
if (strcmp (nm_vpn_plugin_info_get_service (iter->data), service) == 0)
if (strcmp (NM_VPN_PLUGIN_INFO_GET_PRIVATE (iter->data)->service, service) == 0)
return iter->data;
}
return NULL;
@ -566,22 +566,6 @@ nm_vpn_plugin_info_get_name (NMVpnPluginInfo *self)
return NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->name;
}
/**
* nm_vpn_plugin_info_get_service:
* @self: plugin info instance
*
* Returns: (transfer none): the service. Cannot be %NULL.
*
* Since: 1.2
*/
const char *
nm_vpn_plugin_info_get_service (NMVpnPluginInfo *self)
{
g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (self), NULL);
return NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->service;
}
/**
* nm_vpn_plugin_info_get_plugin:
* @self: plugin info instance
@ -760,7 +744,7 @@ nm_vpn_plugin_info_load_editor_plugin (NMVpnPluginInfo *self, GError **error)
priv->editor_plugin_loaded = TRUE;
priv->editor_plugin = nm_vpn_editor_plugin_load_from_file (plugin_filename,
nm_vpn_plugin_info_get_service (self),
priv->service,
getuid (),
NULL,
NULL,

2
libnm-core/nm-vpn-plugin-info.h
View file

@ -75,8 +75,6 @@ const char *nm_vpn_plugin_info_get_name (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_filename (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_service (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_plugin (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_program (NMVpnPluginInfo *self);

1
libnm/libnm.ver
View file

@ -906,7 +906,6 @@ global:
nm_vpn_plugin_info_get_name;
nm_vpn_plugin_info_get_plugin;
nm_vpn_plugin_info_get_program;
nm_vpn_plugin_info_get_service;
nm_vpn_plugin_info_get_type;
nm_vpn_plugin_info_load_editor_plugin;
nm_vpn_plugin_info_lookup_property;

1
src/vpn-manager/nm-vpn-connection.c
View file

@ -2046,7 +2046,6 @@ nm_vpn_connection_activate (NMVpnConnection *self,
g_return_if_fail (s_vpn);
service = nm_setting_vpn_get_service_type (s_vpn);
g_return_if_fail (!g_strcmp0 (service, nm_vpn_plugin_info_get_service (plugin_info)));
if (nm_vpn_plugin_info_supports_multiple (plugin_info)) {
const char *path;