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

clients/trivial: rename nm_vpn_get_plugins() to nm_vpn_get_plugin_infos()

Browse source
This commit is contained in:
Thomas Haller 2016-06-06 10:21:18 +02:00
parent 971a8181f6
commit a2b34f7f12
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/common/nm-vpn-helpers.c
View file

@ -45,7 +45,7 @@ nm_vpn_lookup_plugin (const char *name, const char *service, GError **error)
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (G_UNLIKELY (!plugins_loaded))
nm_vpn_get_plugins ();
nm_vpn_get_plugin_infos ();
if (service)
plugin_info = nm_vpn_plugin_info_list_find_by_service (plugins, service);
@ -86,7 +86,7 @@ nm_vpn_lookup_plugin (const char *name, const char *service, GError **error)
}
GSList *
nm_vpn_get_plugins (void)
nm_vpn_get_plugin_infos (void)
{
if (G_LIKELY (plugins_loaded))
return plugins;
@ -115,7 +115,7 @@ nm_vpn_get_plugin_names (gboolean only_available_plugins)
};
guint i, j, k;
p = nm_vpn_get_plugins ();
p = nm_vpn_get_plugin_infos ();
list = g_new0 (const char *, g_slist_length (p) + G_N_ELEMENTS (known_names) + 1);
i = 0;
@ -146,7 +146,7 @@ nm_vpn_get_service_for_name (const char *name)
g_return_val_if_fail (name, NULL);
plugin_info = nm_vpn_plugin_info_list_find_by_name (nm_vpn_get_plugins (), name);
plugin_info = nm_vpn_plugin_info_list_find_by_name (nm_vpn_get_plugin_infos (), name);
if (plugin_info) {
/* this only means we have a .name file (NMVpnPluginInfo). Possibly the
* NMVpnEditorPlugin is not loadable. */

2
clients/common/nm-vpn-helpers.h
View file

@ -28,7 +28,7 @@ struct {
const char *ui_name;
} typedef VpnPasswordName;
GSList *nm_vpn_get_plugins (void);
GSList *nm_vpn_get_plugin_infos (void);
const char **nm_vpn_get_plugin_names (gboolean only_available_plugins);

2
clients/tui/nm-editor-utils.c
View file

@ -223,7 +223,7 @@ nm_editor_utils_get_connection_type_list (void)
#if 0
/* Add "VPN" only if there are plugins */
vpn_plugins_hash = nm_vpn_get_plugins ();
vpn_plugins_hash = nm_vpn_get_plugin_infos ();
have_vpn_plugins = vpn_plugins_hash && g_hash_table_size (vpn_plugins_hash);
if (have_vpn_plugins) {
GHashTableIter iter;