diff options
Diffstat (limited to 'libnm-core/nm-setting-wireless.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index e1e427898b..e3d130a04e 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -22,13 +22,11 @@ #include <string.h> #include <net/ethernet.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-wireless.h" #include "nm-param-spec-dbus.h" #include "nm-utils.h" -#include "nm-dbus-glib-types.h" #include "nm-utils-private.h" #include "nm-setting-private.h" @@ -995,7 +993,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_SSID, _nm_param_spec_dbus (NM_SETTING_WIRELESS_SSID, "", "", G_TYPE_BYTES, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_bytes_to_dbus, _nm_utils_bytes_from_dbus, G_PARAM_READWRITE | @@ -1059,7 +1057,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_BSSID, _nm_param_spec_dbus (NM_SETTING_WIRELESS_BSSID, "", "", 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 | @@ -1109,7 +1107,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_MAC_ADDRESS, _nm_param_spec_dbus (NM_SETTING_WIRELESS_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 | @@ -1125,7 +1123,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_CLONED_MAC_ADDRESS, _nm_param_spec_dbus (NM_SETTING_WIRELESS_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 | @@ -1142,7 +1140,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_dbus (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | @@ -1162,7 +1160,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_SEEN_BSSIDS, _nm_param_spec_dbus (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | |