diff options
Diffstat (limited to 'libnm-core/nm-setting-wired.c')
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 553bfd4ab5..0ad800e3b9 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -22,14 +22,12 @@ #include <string.h> #include <net/ethernet.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-wired.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" /** @@ -905,7 +903,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_MAC_ADDRESS, _nm_param_spec_dbus (NM_SETTING_WIRED_MAC_ADDRESS, "", "", G_TYPE_STRING, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_from_dbus, G_PARAM_READWRITE | @@ -922,7 +920,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_CLONED_MAC_ADDRESS, _nm_param_spec_dbus (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "", G_TYPE_STRING, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_from_dbus, G_PARAM_READWRITE | @@ -941,7 +939,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_dbus (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | @@ -977,7 +975,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_S390_SUBCHANNELS, _nm_param_spec_dbus (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | @@ -1011,7 +1009,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_S390_OPTIONS, _nm_param_spec_dbus (NM_SETTING_WIRED_S390_OPTIONS, "", "", G_TYPE_HASH_TABLE, - DBUS_TYPE_G_MAP_OF_STRING, + G_VARIANT_TYPE ("a{ss}"), _nm_utils_strdict_to_dbus, _nm_utils_strdict_from_dbus, G_PARAM_READWRITE | |