diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-04-29 16:17:06 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-04-29 16:18:31 +0200 |
| commit | 4940cfcd7ec3db3c4503f6e749b5754ae47009cb (patch) | |
| tree | 38a5aaed85a6427b7374d92676f73cfc27d30807 | |
| parent | 4a3339d37c7a8dd614db03ea52237d39b65d4096 (diff) | |
| download | NetworkManager-4940cfcd7ec3db3c4503f6e749b5754ae47009cb.tar.gz | |
clients/trivial: rename VpnPasswordName struct to have NM prefix
| -rw-r--r-- | clients/common/nm-secret-agent-simple.c | 2 | ||||
| -rw-r--r-- | clients/common/nm-vpn-helpers.c | 6 | ||||
| -rw-r--r-- | clients/common/nm-vpn-helpers.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 4e027584c8..53217e6f33 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -422,7 +422,7 @@ add_vpn_secrets (RequestData *request, char **msg) { NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection); - const VpnPasswordName *p; + const NmcVpnPasswordName *p; const char *vpn_msg = NULL; char **iter; diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index a7740d0735..fbcb06479d 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -103,7 +103,7 @@ nm_vpn_supports_ipv6 (NMConnection *connection) return NM_FLAGS_HAS (capabilities, NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6); } -const VpnPasswordName * +const NmcVpnPasswordName * nm_vpn_get_secret_names (const char *service_type) { const char *type; @@ -121,9 +121,9 @@ nm_vpn_get_secret_names (const char *service_type) #define _VPN_PASSWORD_LIST(...) \ ({ \ - static const VpnPasswordName _arr[] = { \ + static const NmcVpnPasswordName _arr[] = { \ __VA_ARGS__ \ - { .name = NULL, .ui_name = NULL }, \ + { 0 }, \ }; \ _arr; \ }) diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index dc7c0c9f69..f401c6341d 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -9,7 +9,7 @@ typedef struct { const char *name; const char *ui_name; -} VpnPasswordName; +} NmcVpnPasswordName; GSList *nm_vpn_get_plugin_infos (void); @@ -17,7 +17,7 @@ NMVpnEditorPlugin *nm_vpn_get_editor_plugin (const char *service_type, GError ** gboolean nm_vpn_supports_ipv6 (NMConnection *connection); -const VpnPasswordName *nm_vpn_get_secret_names (const char *service_type); +const NmcVpnPasswordName *nm_vpn_get_secret_names (const char *service_type); gboolean nm_vpn_openconnect_authenticate_helper (const char *host, char **cookie, |