diff options
| author | Dan Winship <danw@gnome.org> | 2014-11-15 17:34:19 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-11-19 09:24:10 -0500 |
| commit | 2f81a8bcbe968381e66abf4758cc3e12ac8cb5a7 (patch) | |
| tree | 8a3b8566d983c58309392f8e7b67878bc0b5a776 | |
| parent | c14486984ec087cabda61bb6ef2a5c587bbaf760 (diff) | |
| download | NetworkManager-2f81a8bcbe968381e66abf4758cc3e12ac8cb5a7.tar.gz | |
libnm-core: make GBytes D-Bus marshalling be built-in to NMSetting
Each GBytes-valued property was using
_nm_setting_class_transform_property() to register a GBytes<->'ay'
transform. So just build that rule into the generic machinery in
nm-setting.c.
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 28 | ||||
| -rw-r--r-- | libnm-core/nm-setting-olpc-mesh.c | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wireless.c | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting.c | 4 |
4 files changed, 4 insertions, 36 deletions
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 90f52f6025..546a2c443b 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -3206,10 +3206,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_CA_CERT, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:ca-path: @@ -3302,10 +3298,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_CLIENT_CERT, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:phase1-peapver: @@ -3456,10 +3448,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_PHASE2_CA_CERT, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:phase2-ca-path: @@ -3549,10 +3537,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:password: @@ -3616,10 +3600,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_PASSWORD_RAW, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:password-raw-flags: @@ -3684,10 +3664,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_PRIVATE_KEY, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:private-key-password: @@ -3772,10 +3748,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSetting8021x:phase2-private-key-password: diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c index 5b4753a8a6..c1d54bee89 100644 --- a/libnm-core/nm-setting-olpc-mesh.c +++ b/libnm-core/nm-setting-olpc-mesh.c @@ -233,10 +233,6 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_OLPC_MESH_SSID, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSettingOlpcMesh:channel: diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 678c786c5e..696ade3082 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -1014,10 +1014,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) G_TYPE_BYTES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_transform_property (parent_class, NM_SETTING_WIRELESS_SSID, - G_VARIANT_TYPE_BYTESTRING, - _nm_utils_bytes_to_dbus, - _nm_utils_bytes_from_dbus); /** * NMSettingWireless:mode: diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 45f72d0323..50dab89d80 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -645,6 +645,8 @@ get_property_for_dbus (NMSetting *setting, dbus_value = g_variant_new_int32 (g_value_get_enum (&prop_value)); else if (g_type_is_a (prop_value.g_type, G_TYPE_FLAGS)) dbus_value = g_variant_new_uint32 (g_value_get_flags (&prop_value)); + else if (prop_value.g_type == G_TYPE_BYTES) + dbus_value = _nm_utils_bytes_to_dbus (&prop_value); else dbus_value = g_dbus_gvalue_to_gvariant (&prop_value, variant_type_for_gtype (prop_value.g_type)); g_value_unset (&prop_value); @@ -659,6 +661,8 @@ set_property_from_dbus (const NMSettingProperty *property, GVariant *src_value, if (property->from_dbus) property->from_dbus (src_value, dst_value); + else if (dst_value->g_type == G_TYPE_BYTES) + _nm_utils_bytes_from_dbus (src_value, dst_value); else g_dbus_gvariant_to_gvalue (src_value, dst_value); } |