summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-06-08 12:44:36 +0200
committerThomas Haller <thaller@redhat.com>2016-06-15 15:15:13 +0200
commite69d2863adfa939a70347f341ebbab3d04ac3c51 (patch)
treeef5fe338ecc376e65c232d3c87c2b5629db24a33
parentcd24e4a0c49273b9e1eb5a83acb7423c780e7547 (diff)
downloadnetwork-manager-applet-e69d2863adfa939a70347f341ebbab3d04ac3c51.tar.gz
c-e/trivial: rename function vpn_get_plugins() to vpn_get_plugin_infos()
-rw-r--r--src/connection-editor/connection-helpers.c2
-rw-r--r--src/connection-editor/vpn-helpers.c6
-rw-r--r--src/connection-editor/vpn-helpers.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 5fa33163..25260c5e 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -248,7 +248,7 @@ set_up_connection_type_combo (GtkComboBox *combo,
added++;
}
- vpn_plugins = vpn_get_plugins ();
+ vpn_plugins = vpn_get_plugin_infos ();
if (!vpn_plugins || vpn_index == -1) {
gtk_combo_box_set_active (combo, show_headers ? active + 1 : active);
return;
diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
index 4a875ed6..838450af 100644
--- a/src/connection-editor/vpn-helpers.c
+++ b/src/connection-editor/vpn-helpers.c
@@ -33,7 +33,7 @@ vpn_get_plugin_by_service (const char *service)
{
NMVpnPluginInfo *plugin_info;
- plugin_info = nm_vpn_plugin_info_list_find_by_service (vpn_get_plugins (), service);
+ plugin_info = nm_vpn_plugin_info_list_find_by_service (vpn_get_plugin_infos (), service);
if (plugin_info)
return nm_vpn_plugin_info_get_editor_plugin (plugin_info);
return NULL;
@@ -46,7 +46,7 @@ _sort_vpn_plugins (NMVpnPluginInfo *aa, NMVpnPluginInfo *bb)
}
GSList *
-vpn_get_plugins (void)
+vpn_get_plugin_infos (void)
{
static gboolean plugins_loaded = FALSE;
static GSList *plugins = NULL;
@@ -120,7 +120,7 @@ import_vpn_from_file_cb (GtkWidget *dialog, gint response, gpointer user_data)
goto out;
}
- for (iter = vpn_get_plugins (); !connection && iter; iter = iter->next) {
+ for (iter = vpn_get_plugin_infos (); !connection && iter; iter = iter->next) {
NMVpnEditorPlugin *plugin;
plugin = nm_vpn_plugin_info_get_editor_plugin (iter->data);
diff --git a/src/connection-editor/vpn-helpers.h b/src/connection-editor/vpn-helpers.h
index bc017fb8..2c70d329 100644
--- a/src/connection-editor/vpn-helpers.h
+++ b/src/connection-editor/vpn-helpers.h
@@ -28,7 +28,7 @@
#include <NetworkManager.h>
-GSList *vpn_get_plugins (void);
+GSList *vpn_get_plugin_infos (void);
NMVpnEditorPlugin *vpn_get_plugin_by_service (const char *service);