fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 04:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/vpn: add nm_vpn_plugin_info_get_auth_dialog()

Browse source
This commit is contained in:
Thomas Haller 2016-04-20 16:18:05 +02:00
parent 0d95ed3bb8
commit a3f94f451b
4 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnm-core/Makefile.am
View file

@ -12,6 +12,7 @@ AM_CPPFLAGS = \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
-DNMPLUGINDIR=\"$(pkglibdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \

39
libnm-core/nm-vpn-plugin-info.c
View file

@ -45,6 +45,7 @@ typedef struct {
char *filename;
char *name;
char *service;
char *auth_dialog;
char **aliases;
GKeyFile *keyfile;
@ -594,6 +595,43 @@ nm_vpn_plugin_info_get_service (NMVpnPluginInfo *self)
return NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->service;
}
/**
* nm_vpn_plugin_info_get_auth_dialog:
* @self: plugin info instance
*
* Returns: the absolute path to the auth-dialog helper or %NULL.
*
* Since: 1.4
**/
const char *
nm_vpn_plugin_info_get_auth_dialog (NMVpnPluginInfo *self)
{
NMVpnPluginInfoPrivate *priv;
g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (self), NULL);
priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (self);
if (G_UNLIKELY (priv->auth_dialog == NULL)) {
const char *s;
s = g_hash_table_lookup (priv->keys, _nm_utils_strstrdictkey_static (NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME, "auth-dialog"));
if (!s || !s[0])
priv->auth_dialog = g_strdup ("");
else if (g_path_is_absolute (s))
priv->auth_dialog = g_strdup (s);
else {
gs_free char *prog_basename;
/* for relative paths, we take the basename and assume it's in LIBEXECDIR. */
prog_basename = g_path_get_basename (s);
priv->auth_dialog = g_build_filename (LIBEXECDIR, prog_basename, NULL);
}
}
return priv->auth_dialog[0] ? priv->auth_dialog : NULL;
}
/**
* nm_vpn_plugin_info_get_plugin:
* @self: plugin info instance
@ -966,6 +1004,7 @@ finalize (GObject *object)
g_free (priv->name);
g_free (priv->service);
g_free (priv->auth_dialog);
g_strfreev (priv->aliases);
g_free (priv->filename);
g_hash_table_unref (priv->keys);

2
libnm-core/nm-vpn-plugin-info.h
View file

@ -80,6 +80,8 @@ NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_plugin (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
const char *nm_vpn_plugin_info_get_program (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_4
const char *nm_vpn_plugin_info_get_auth_dialog (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
gboolean nm_vpn_plugin_info_supports_multiple (NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2

1
libnm/libnm.ver
View file

@ -1062,5 +1062,6 @@ global:
libnm_1_4_0 {
global:
nm_vpn_editor_plugin_load;
nm_vpn_plugin_info_get_auth_dialog;
nm_vpn_plugin_info_get_service;
} libnm_1_2_0;