diff options
author | Thomas Haller <thaller@redhat.com> | 2016-06-06 10:21:18 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-06-15 10:32:32 +0200 |
commit | a2b34f7f126491215ef9de9c78289c0287ade05b (patch) | |
tree | 3bb0e7ef125ac5d26480d8a5839cfbd205fa5cba | |
parent | 971a8181f68596d04ef9f81d2c3ad32d73f56de8 (diff) | |
download | NetworkManager-a2b34f7f126491215ef9de9c78289c0287ade05b.tar.gz |
clients/trivial: rename nm_vpn_get_plugins() to nm_vpn_get_plugin_infos()
-rw-r--r-- | clients/common/nm-vpn-helpers.c | 8 | ||||
-rw-r--r-- | clients/common/nm-vpn-helpers.h | 2 | ||||
-rw-r--r-- | clients/tui/nm-editor-utils.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index eb0f3af131..4eaa92d9f8 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -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. */ diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index 79fc94e957..3d192f7fc8 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -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); diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 25a64c2eed..9e6263e633 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -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; |