diff options
Diffstat (limited to 'libnm-core/nm-setting-dcb.c')
| -rw-r--r-- | libnm-core/nm-setting-dcb.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 89f479f88f..f6c431302e 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -20,14 +20,12 @@ */ #include <string.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-dcb.h" #include "nm-param-spec-dbus.h" #include "nm-utils.h" #include "nm-utils-private.h" -#include "nm-dbus-glib-types.h" #include "nm-setting-private.h" #include "nm-core-enum-types.h" @@ -782,22 +780,23 @@ take_uint_array (GValue *v, uint *a, size_t len) #define TAKE_UINT_ARRAY(v, a) take_uint_array (v, a, G_N_ELEMENTS (a)) -static void -_nm_setting_dcb_uint_array_to_dbus (const GValue *prop_value, - GValue *dbus_value) +static GVariant * +_nm_setting_dcb_uint_array_to_dbus (const GValue *prop_value) { GArray *src = g_value_get_boxed (prop_value); - set_uint_array (dbus_value, (guint *) src->data, src->len); + return g_variant_new_fixed_array (G_VARIANT_TYPE_UINT32, src->data, src->len, sizeof (guint32)); } static void -_nm_setting_dcb_uint_array_from_dbus (const GValue *dbus_value, +_nm_setting_dcb_uint_array_from_dbus (GVariant *dbus_value, GValue *prop_value) { - GArray *src = g_value_get_boxed (dbus_value); + gconstpointer array; + gsize length; - take_uint_array (prop_value, (guint *) src->data, src->len); + array = g_variant_get_fixed_array (dbus_value, &length, sizeof (guint32)); + take_uint_array (prop_value, (guint *) array, length); } static void @@ -1063,7 +1062,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PFC, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | @@ -1097,7 +1096,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PRIORITY_GROUP_ID, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | @@ -1117,7 +1116,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PRIORITY_GROUP_BANDWIDTH, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | @@ -1138,7 +1137,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PRIORITY_BANDWIDTH, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | @@ -1157,7 +1156,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PRIORITY_STRICT, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | @@ -1176,7 +1175,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_PRIORITY_TRAFFIC_CLASS, _nm_param_spec_dbus (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "", G_TYPE_ARRAY, - DBUS_TYPE_G_UINT_ARRAY, + G_VARIANT_TYPE ("au"), _nm_setting_dcb_uint_array_to_dbus, _nm_setting_dcb_uint_array_from_dbus, G_PARAM_READWRITE | |