diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
| commit | 9bc3ff81969c896f6bf8e1c93f98f43f6ffffaf8 (patch) | |
| tree | 302fce2d1ab3a130ac0b684d168ab6312825fcd2 /libnm-core/nm-setting-ovs-interface.c | |
| parent | f97666c6bd29a3228443acd6401a407a19ec8d25 (diff) | |
| parent | 9a6dcbf895f9da01768e64b73cec88c16157d91e (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir a0f3ffb137940d423625faae8bedbaced4d34cda
Diffstat (limited to 'libnm-core/nm-setting-ovs-interface.c')
| -rw-r--r-- | libnm-core/nm-setting-ovs-interface.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c index a177098d..ad7f2ead 100644 --- a/libnm-core/nm-setting-ovs-interface.c +++ b/libnm-core/nm-setting-ovs-interface.c @@ -33,11 +33,11 @@ * necessary for Open vSwitch interfaces. **/ -enum { - PROP_0, +/*****************************************************************************/ + +NM_GOBJECT_PROPERTIES_DEFINE_BASE ( PROP_TYPE, - LAST_PROP -}; +); /** * NMSettingOvsInterface: @@ -366,8 +366,8 @@ nm_setting_ovs_interface_class_init (NMSettingOvsInterfaceClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); NMSettingClass *setting_class = NM_SETTING_CLASS (klass); - object_class->set_property = set_property; object_class->get_property = get_property; + object_class->set_property = set_property; object_class->finalize = finalize; setting_class->verify = verify; @@ -379,14 +379,15 @@ nm_setting_ovs_interface_class_init (NMSettingOvsInterfaceClass *klass) * * Since: 1.10 **/ - g_object_class_install_property - (object_class, PROP_TYPE, - g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS)); + obj_properties[PROP_TYPE] = + g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | + G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_INTERFACE); } |