fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 13:10:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: distinguish between resetting GObject property to default and NULL

Browse source 
Most GObject properties default to FALSE/NULL/0. In that case, there
is no difference between setting the default or clearing the value.

During

     if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
         return _gobject_property_reset_default (setting, property_info->property_name);

it is correct to reset the default.

However for list-typed properties, we want to clear the list. So,
it should be

     if (_SET_FCN_DO_SET_ALL (modifier, value))
         _gobject_property_reset (setting, property_info->property_name, FALSE);
This commit is contained in:
Thomas Haller 2019-03-20 17:02:55 +01:00
parent 166e04799d
commit 96c4f51208
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -852,7 +852,9 @@ _gobject_property_is_default (NMSetting *setting, const char *prop_name)
}
static gboolean
_gobject_property_reset_default (NMSetting *setting, const char *prop_name)
_gobject_property_reset (NMSetting *setting,
const char *prop_name,
gboolean reset_default)
{
nm_auto_unset_gvalue GValue v = G_VALUE_INIT;
GParamSpec *pspec;
@ -863,11 +865,18 @@ _gobject_property_reset_default (NMSetting *setting, const char *prop_name)
g_return_val_if_reached (FALSE);
g_value_init (&v, pspec->value_type);
g_param_value_defaults (pspec, &v);
if (reset_default)
g_param_value_defaults (pspec, &v);
g_object_set_property (G_OBJECT (setting), prop_name, &v);
return TRUE;
}
static gboolean
_gobject_property_reset_default (NMSetting *setting, const char *prop_name)
{
return _gobject_property_reset (setting, prop_name, TRUE);
}
static gconstpointer
_get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info,
NMSetting *setting,
@ -1889,7 +1898,7 @@ _set_fcn_multilist (ARGS_SET_FCN)
nstrv = j;
if (_SET_FCN_DO_SET_ALL (modifier, value))
_gobject_property_reset_default (setting, property_info->property_name);
_gobject_property_reset (setting, property_info->property_name, FALSE);
for (i = 0; i < nstrv; i++) {
if (_SET_FCN_DO_REMOVE (modifier, value)) {
@ -1980,7 +1989,7 @@ _set_fcn_optionlist (ARGS_SET_FCN)
}
if (_SET_FCN_DO_SET_ALL (modifier, value))
_gobject_property_reset_default (setting, property_info->property_name);
_gobject_property_reset (setting, property_info->property_name, FALSE);
for (i = 0; i < nstrv; i++) {
if (!property_info->property_typ_data->subtype.optionlist.set_fcn (setting,
@ -3233,7 +3242,7 @@ _set_fcn_objlist (ARGS_SET_FCN)
if (property_info->property_typ_data->subtype.objlist.clear_all_fcn)
property_info->property_typ_data->subtype.objlist.clear_all_fcn (setting);
else
_gobject_property_reset_default (setting, property_info->property_name);
_gobject_property_reset (setting, property_info->property_name, FALSE);
}
for (i = 0; i < nstrv; i++) {