clients/trivial: rename VpnPasswordName struct to have NM prefix

This commit is contained in:
Thomas Haller 2020-04-29 16:17:06 +02:00
parent 4a3339d37c
commit 4940cfcd7e
3 changed files with 6 additions and 6 deletions

View file

@ -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;

View file

@ -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; \
})

View file

@ -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,