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

cli: fix nmc_setting_get_valid_properties() to use setting metadata

Browse source 
Not all properties that we want to handle in nmcli are actual GObject
properties. For the moment that was the case, but that's about to change.

This is a change in behavior with respect of the order in which
properties are reported. For example, print_setting_description()
now prints the property descriptions in a different order. However,
one might argue that this order makes more sense because:

  - it's the same order as properties are listed in
    "nm-meta-setting-desc.c". At that place, we have explict
    control over the order and set it intentionally to suite
    our needs best. The order of the GObject properties is
    much less well defined.

  - the order from "nm-meta-setting-desc.c" is used at several other
    places. So, it makes sense to use the same order everywhere.
This commit is contained in:
Thomas Haller 2018-08-01 17:24:16 +02:00
parent 23adc37377
commit d70dcb16da
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clients/cli/settings.c
View file

@ -662,25 +662,19 @@ nmc_setting_remove_property_option (NMSetting *setting,
char **
nmc_setting_get_valid_properties (NMSetting *setting)
{
char **valid_props = NULL;
GParamSpec **props, **iter;
guint num;
int i;
const NMMetaSettingInfoEditor *setting_info;
char **valid_props;
guint i, num;
/* Iterate through properties */
i = 0;
props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (setting)), &num);
valid_props = g_malloc0 (sizeof (char*) * (num + 1));
for (iter = props; iter && *iter; iter++) {
const char *key_name = g_param_spec_get_name (*iter);
setting_info = nm_meta_setting_info_editor_find_by_setting (setting);
/* Add all properties except for "name" that is non-editable */
if (g_strcmp0 (key_name, "name") != 0)
valid_props[i++] = g_strdup (key_name);
}
valid_props[i] = NULL;
g_free (props);
num = setting_info ? setting_info->properties_num : 0;
valid_props = g_new (char *, num + 1);
for (i = 0; i < num; i++)
valid_props[i] = g_strdup (setting_info->properties[i]->property_name);
valid_props[num] = NULL;
return valid_props;
}