New upstream version 1.22.0 upstream/1.22.0

1 files changed, 14 insertions, 52 deletions

diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c
index 9feb4ea2..3c12abdf 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -757,6 +743,12 @@ _nm_setting_dcb_uint_array_from_dbus (GVariant *dbus_value,
 	set_gvalue_from_array (prop_value, (guint *) array, length);
 }
 
+static const NMSettInfoPropertType nm_sett_info_propert_type_dcb_au = {
+	.dbus_type           = NM_G_VARIANT_TYPE ("au"),
+	.gprop_to_dbus_fcn   = _nm_setting_dcb_uint_array_to_dbus,
+	.gprop_from_dbus_fcn = _nm_setting_dcb_uint_array_from_dbus,
+};
+
 /*****************************************************************************/
 
 static void
@@ -1111,12 +1103,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                   obj_properties[PROP_PRIORITY_FLOW_CONTROL],
-	                                   G_VARIANT_TYPE ("au"),
-	                                   _nm_setting_dcb_uint_array_to_dbus,
-	                                   _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_FLOW_CONTROL], &nm_sett_info_propert_type_dcb_au);
 
 	/**
 	 * NMSettingDcb:priority-group-flags:
@@ -1159,12 +1146,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                   obj_properties[PROP_PRIORITY_GROUP_ID],
-	                                   G_VARIANT_TYPE ("au"),
-	                                   _nm_setting_dcb_uint_array_to_dbus,
-	                                   _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_ID], &nm_sett_info_propert_type_dcb_au);
 
 	/**
 	 * NMSettingDcb:priority-group-bandwidth: (type GArray(guint))
@@ -1186,12 +1168,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                   obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH],
-	                                   G_VARIANT_TYPE ("au"),
-	                                   _nm_setting_dcb_uint_array_to_dbus,
-	                                   _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
 
 	/**
 	 * NMSettingDcb:priority-bandwidth: (type GArray(guint))
@@ -1215,12 +1192,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                   obj_properties[PROP_PRIORITY_BANDWIDTH],
-	                                   G_VARIANT_TYPE ("au"),
-	                                   _nm_setting_dcb_uint_array_to_dbus,
-	                                   _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
 
 	/**
 	 * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean))
@@ -1242,12 +1214,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                   obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH],
-	                                   G_VARIANT_TYPE ("au"),
-	                                   _nm_setting_dcb_uint_array_to_dbus,
-	                                   _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
 
 	/**
 	 * NMSettingDcb:priority-traffic-class: (type GArray(guint))
@@ -1268,12 +1235,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	                        G_TYPE_ARRAY,
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
-
-	_properties_override_add_transform (properties_override,
-	                                    obj_properties[PROP_PRIORITY_TRAFFIC_CLASS],
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_TRAFFIC_CLASS], &nm_sett_info_propert_type_dcb_au);
 
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);