[network-manager-applet/th/vpn-service-info-bgo767197: 3/8] c-e/trivial: rename function vpn_get_plugins() to vpn_get_plugin_infos()
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/th/vpn-service-info-bgo767197: 3/8] c-e/trivial: rename function vpn_get_plugins() to vpn_get_plugin_infos()
- Date: Mon, 13 Jun 2016 08:31:43 +0000 (UTC)
commit 54af151b3f591535a33f060838829607fa75ba97
Author: Thomas Haller <thaller redhat com>
Date: Wed Jun 8 12:44:36 2016 +0200
c-e/trivial: rename function vpn_get_plugins() to vpn_get_plugin_infos()
src/connection-editor/connection-helpers.c | 2 +-
src/connection-editor/vpn-helpers.c | 6 +++---
src/connection-editor/vpn-helpers.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 997006c..7ea0249 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 4a875ed..838450a 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 bc017fb..2c70d32 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]