diff options
Diffstat (limited to 'libnm-core/nm-setting-8021x.c')
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 1e99f9c172..a2ea491047 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -21,13 +21,11 @@ */ #include <string.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-8021x.h" #include "nm-param-spec-dbus.h" #include "nm-utils.h" -#include "nm-dbus-glib-types.h" #include "crypto.h" #include "nm-utils-private.h" #include "nm-setting-private.h" @@ -3121,7 +3119,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_EAP, _nm_param_spec_dbus (NM_SETTING_802_1X_EAP, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -3187,7 +3185,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_CA_CERT, _nm_param_spec_dbus (NM_SETTING_802_1X_CA_CERT, "", "", 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 | @@ -3232,7 +3230,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_ALTSUBJECT_MATCHES, _nm_param_spec_dbus (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -3257,7 +3255,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_CLIENT_CERT, _nm_param_spec_dbus (NM_SETTING_802_1X_CLIENT_CERT, "", "", 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 | @@ -3369,7 +3367,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PHASE2_CA_CERT, _nm_param_spec_dbus (NM_SETTING_802_1X_PHASE2_CA_CERT, "", "", 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 | @@ -3416,7 +3414,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PHASE2_ALTSUBJECT_MATCHES, _nm_param_spec_dbus (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, "", "", G_TYPE_STRV, - G_TYPE_STRV, + G_VARIANT_TYPE_STRING_ARRAY, NULL, NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -3444,7 +3442,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PHASE2_CLIENT_CERT, _nm_param_spec_dbus (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "", "", 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 | @@ -3490,7 +3488,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PASSWORD_RAW, _nm_param_spec_dbus (NM_SETTING_802_1X_PASSWORD_RAW, "", "", 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 | @@ -3544,7 +3542,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PRIVATE_KEY, _nm_param_spec_dbus (NM_SETTING_802_1X_PRIVATE_KEY, "", "", 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 | @@ -3611,7 +3609,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PHASE2_PRIVATE_KEY, _nm_param_spec_dbus (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "", "", 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 | |