fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: use direct properties for NMSettingBluetooth

Browse source
This commit is contained in:
Thomas Haller 2021-07-13 17:37:08 +02:00
parent e399fda04c
commit b688fc3da4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 12 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/libnm-core-impl/nm-setting-bluetooth.c
View file

@ -94,6 +94,8 @@ nm_setting_bluetooth_get_bdaddr(NMSettingBluetooth *setting)
return NM_SETTING_BLUETOOTH_GET_PRIVATE(setting)->bdaddr; return NM_SETTING_BLUETOOTH_GET_PRIVATE(setting)->bdaddr;
} }
/*****************************************************************************/
static gboolean static gboolean
verify(NMSetting *setting, NMConnection *connection, GError **error) verify(NMSetting *setting, NMConnection *connection, GError **error)
{ {
@ -228,24 +230,6 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
/*****************************************************************************/ /*****************************************************************************/
static void
get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
NMSettingBluetooth *setting = NM_SETTING_BLUETOOTH(object);
switch (prop_id) {
case PROP_BDADDR:
g_value_set_string(value, nm_setting_bluetooth_get_bdaddr(setting));
break;
case PROP_TYPE:
g_value_set_string(value, nm_setting_bluetooth_get_connection_type(setting));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
}
}
static void static void
set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{ {
@ -285,17 +269,6 @@ nm_setting_bluetooth_new(void)
return g_object_new(NM_TYPE_SETTING_BLUETOOTH, NULL); return g_object_new(NM_TYPE_SETTING_BLUETOOTH, NULL);
} }
static void
finalize(GObject *object)
{
NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE(object);
g_free(priv->bdaddr);
g_free(priv->type);
G_OBJECT_CLASS(nm_setting_bluetooth_parent_class)->finalize(object);
}
static void static void
nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass) nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass)
{ {
@ -305,11 +278,11 @@ nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass)
g_type_class_add_private(klass, sizeof(NMSettingBluetoothPrivate)); g_type_class_add_private(klass, sizeof(NMSettingBluetoothPrivate));
object_class->get_property = get_property; object_class->get_property = _nm_setting_property_get_property_direct;
object_class->set_property = set_property; object_class->set_property = set_property;
object_class->finalize = finalize;
setting_class->verify = verify; setting_class->verify = verify;
setting_class->finalize_direct = TRUE;
/** /**
* NMSettingBluetooth:bdaddr: * NMSettingBluetooth:bdaddr:
@ -333,12 +306,13 @@ nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass)
* Either "dun" for Dial-Up Networking connections or "panu" for Personal * Either "dun" for Dial-Up Networking connections or "panu" for Personal
* Area Networking connections to devices supporting the NAP profile. * Area Networking connections to devices supporting the NAP profile.
**/ **/
obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_BLUETOOTH_TYPE, _nm_setting_property_define_direct_string(properties_override,
"", obj_properties,
"", NM_SETTING_BLUETOOTH_TYPE,
NULL, PROP_TYPE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE NM_SETTING_PARAM_INFERRABLE,
| G_PARAM_STATIC_STRINGS); NMSettingBluetoothPrivate,
type);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);