diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-01-11 08:32:54 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-13 15:27:23 +0100 |
| commit | f84b4274755537a144e5a202528e63bfbb24b462 (patch) | |
| tree | acec12eacf212154d86aa718f61ef9f3e3a6086d /libnm-core/nm-setting-user.c | |
| parent | 5b3bc8d48fe409b75ed173a77a63340f92b3849e (diff) | |
| download | NetworkManager-th/libnm-settings-properties.tar.gz | |
libnm-core: reorder code in settingsth/libnm-settings-properties
Order the code in our common way. No other changes.
- ensure to include the main header first (directly after
"nm-default.h").
- reorder function definitions: get_property(), set_property(),
*_init(), *_new(), finalize(), *_class_init().
Diffstat (limited to 'libnm-core/nm-setting-user.c')
| -rw-r--r-- | libnm-core/nm-setting-user.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c index cef02092c8..01ac671b14 100644 --- a/libnm-core/nm-setting-user.c +++ b/libnm-core/nm-setting-user.c @@ -550,8 +550,8 @@ nm_setting_user_class_init (NMSettingUserClass *klass) NMSettingClass *setting_class = NM_SETTING_CLASS (klass); GArray *properties_override = _nm_sett_info_property_override_create_array (); - object_class->set_property = set_property; object_class->get_property = get_property; + object_class->set_property = set_property; object_class->finalize = finalize; setting_class->compare_property = compare_property; @@ -584,15 +584,14 @@ nm_setting_user_class_init (NMSettingUserClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); - _properties_override_add_transform (properties_override, - g_object_class_find_property (G_OBJECT_CLASS (setting_class), - NM_SETTING_USER_DATA), + obj_properties[PROP_DATA], G_VARIANT_TYPE ("a{ss}"), _nm_utils_strdict_to_dbus, _nm_utils_strdict_from_dbus); + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); + _nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_USER, NULL, properties_override); } |