fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-19 02:48:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients: meta: use enum setter for secret flags

Browse source
This commit is contained in:
Beniamino Galvani 2018-04-04 10:14:19 +02:00
parent ae54a75298
commit 350345fff4
1 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
clients/common/nm-meta-setting-desc.c
View file

@ -1175,42 +1175,6 @@ _set_fcn_gobject_mac (ARGS_SET_FCN)
return TRUE;
}
static gboolean
_set_fcn_gobject_secret_flags (ARGS_SET_FCN)
{
gs_free char *err_token = NULL;
gs_free char *str_all = NULL;
int flags;
nm_assert (!error || !*error);
if (!nm_utils_enum_from_str (nm_setting_secret_flags_get_type (),
value,
&flags,
&err_token)) {
str_all = nm_utils_enum_to_str (nm_setting_secret_flags_get_type (),
ALL_SECRET_FLAGS);
g_set_error (error, 1, 0,
_("'%s' is not a valid flag; use <0-%d> or a combination of '%s'"),
err_token,
ALL_SECRET_FLAGS,
str_all);
return FALSE;
}
/* Validate the flags number */
if (flags > ALL_SECRET_FLAGS) {
flags = ALL_SECRET_FLAGS;
_env_warn_fcn (environment, environment_user_data,
NM_META_ENV_WARN_LEVEL_WARN,
N_("'%s' sum is higher than all flags => all flags set"),
value);
}
g_object_set (setting, property_info->property_name, (guint) flags, NULL);
return TRUE;
}
static gboolean
_set_fcn_gobject_enum (ARGS_SET_FCN)
{
@ -4840,7 +4804,7 @@ static const NMMetaPropertyType _pt_gobject_mac = {
static const NMMetaPropertyType _pt_gobject_secret_flags = {
.get_fcn = _get_fcn_gobject_secret_flags,
.set_fcn = _set_fcn_gobject_secret_flags,
.set_fcn = _set_fcn_gobject_enum,
.values_fcn = _values_fcn_gobject_enum,
};