colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm/trivial: rename _properties_override_add_*() to _nm_properties_override_*()

Browse Source 
These macros/functions are in a header file. Everything in a header file
should have an "nm" prefix. Rename.
This commit is contained in:
Thomas Haller
2019-09-22 15:32:04 +02:00
parent e5495c482f
commit a1b575b07b
27 changed files with 251 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-core/nm-setting-bluetooth.c
View File

@@ -295,7 +295,7 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_BDADDR], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_BDADDR], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingBluetooth:type:

4
libnm-core/nm-setting-bond.c
View File

@@ -970,7 +970,7 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_OPTIONS], &nm_sett_info_propert_type_strdict);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_OPTIONS], &nm_sett_info_propert_type_strdict);
/* ---dbus---
* property: interface-name
@@ -980,7 +980,7 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
* bond's interface name.
* ---end---
*/
_properties_override_add_virt (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
_nm_properties_override_dbus (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

2
libnm-core/nm-setting-bridge-port.c
View File

@@ -573,7 +573,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_VLANS], &nm_sett_info_propert_type_bridge_vlans);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_VLANS], &nm_sett_info_propert_type_bridge_vlans);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

6
libnm-core/nm-setting-bridge.c
View File

@@ -1209,7 +1209,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingBridge:stp:
@@ -1461,7 +1461,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_VLANS], &nm_sett_info_propert_type_bridge_vlans);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_VLANS], &nm_sett_info_propert_type_bridge_vlans);
/* ---dbus---
* property: interface-name
@@ -1471,7 +1471,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* bridge's interface name.
* ---end---
*/
_properties_override_add_virt (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
_nm_properties_override_dbus (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

26
libnm-core/nm-setting-connection.c
View File

@@ -1735,13 +1735,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_INTERFACE_NAME],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.from_dbus_fcn = nm_setting_connection_set_interface_name,
.missing_from_dbus_fcn = nm_setting_connection_no_interface_name,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_INTERFACE_NAME],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.from_dbus_fcn = nm_setting_connection_set_interface_name,
.missing_from_dbus_fcn = nm_setting_connection_no_interface_name,
));
/**
* NMSettingConnection:type:
@@ -1920,12 +1920,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_TIMESTAMP],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT64,
.to_dbus_fcn = _to_dbus_fcn_timestamp,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_TIMESTAMP],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT64,
.to_dbus_fcn = _to_dbus_fcn_timestamp,
));
/**
* NMSettingConnection:read-only:

12
libnm-core/nm-setting-dcb.c
View File

@@ -1103,7 +1103,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_FLOW_CONTROL], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_FLOW_CONTROL], &nm_sett_info_propert_type_dcb_au);
/**
* NMSettingDcb:priority-group-flags:
@@ -1146,7 +1146,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_ID], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_ID], &nm_sett_info_propert_type_dcb_au);
/**
* NMSettingDcb:priority-group-bandwidth: (type GArray(guint))
@@ -1168,7 +1168,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
/**
* NMSettingDcb:priority-bandwidth: (type GArray(guint))
@@ -1192,7 +1192,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
/**
* NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean))
@@ -1214,7 +1214,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH], &nm_sett_info_propert_type_dcb_au);
/**
* NMSettingDcb:priority-traffic-class: (type GArray(guint))
@@ -1235,7 +1235,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_PRIORITY_TRAFFIC_CLASS], &nm_sett_info_propert_type_dcb_au);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_PRIORITY_TRAFFIC_CLASS], &nm_sett_info_propert_type_dcb_au);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

4
libnm-core/nm-setting-gsm.c
View File

@@ -847,8 +847,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
G_PARAM_STATIC_STRINGS);
/* Ignore incoming deprecated properties */
_properties_override_add_virt (properties_override, "allowed-bands", &nm_sett_info_propert_type_deprecated_ignore_u);
_properties_override_add_virt (properties_override, "network-type", &nm_sett_info_propert_type_deprecated_ignore_i);
_nm_properties_override_dbus (properties_override, "allowed-bands", &nm_sett_info_propert_type_deprecated_ignore_u);
_nm_properties_override_dbus (properties_override, "network-type", &nm_sett_info_propert_type_deprecated_ignore_i);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

2
libnm-core/nm-setting-infiniband.c
View File

@@ -414,7 +414,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingInfiniband:mtu:

26
libnm-core/nm-setting-ip-config.c
View File

@@ -5194,12 +5194,12 @@ _nm_sett_info_property_override_create_array_ip_config (void)
{
GArray *properties_override = _nm_sett_info_property_override_create_array ();
_properties_override_add_gobj (properties_override,
obj_properties[PROP_GATEWAY],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.from_dbus_fcn = ip_gateway_set,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_GATEWAY],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.from_dbus_fcn = ip_gateway_set,
));
/* ---dbus---
* property: routing-rules
@@ -5207,13 +5207,13 @@ _nm_sett_info_property_override_create_array_ip_config (void)
* description: Array of dictionaries for routing rules.
* ---end---
*/
_properties_override_add_virt (properties_override,
NM_SETTING_IP_CONFIG_ROUTING_RULES,
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = _routing_rules_dbus_only_synth,
.from_dbus_fcn = _routing_rules_dbus_only_set,
));
_nm_properties_override_dbus (properties_override,
NM_SETTING_IP_CONFIG_ROUTING_RULES,
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = _routing_rules_dbus_only_synth,
.from_dbus_fcn = _routing_rules_dbus_only_set,
));
return properties_override;
}

88
libnm-core/nm-setting-ip4-config.c
View File

@@ -796,14 +796,14 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* integers)
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("au"),
.gprop_to_dbus_fcn = ip4_dns_to_dbus,
.gprop_from_dbus_fcn = ip4_dns_from_dbus,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("au"),
.gprop_to_dbus_fcn = ip4_dns_to_dbus,
.gprop_from_dbus_fcn = ip4_dns_from_dbus,
));
/* ---dbus---
* property: addresses
@@ -820,20 +820,20 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* for that subnet.
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aau"),
.to_dbus_fcn = ip4_addresses_get,
.from_dbus_fcn = ip4_addresses_set,
));
_properties_override_add_virt (properties_override,
"address-labels",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
.to_dbus_fcn = ip4_address_labels_get,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aau"),
.to_dbus_fcn = ip4_addresses_get,
.from_dbus_fcn = ip4_addresses_set,
));
_nm_properties_override_dbus (properties_override,
"address-labels",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
.to_dbus_fcn = ip4_address_labels_get,
));
/* ---dbus---
* property: address-data
@@ -844,13 +844,13 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* also exist on some addresses.
* ---end---
*/
_properties_override_add_virt (properties_override,
"address-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip4_address_data_get,
.from_dbus_fcn = ip4_address_data_set,
));
_nm_properties_override_dbus (properties_override,
"address-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip4_address_data_get,
.from_dbus_fcn = ip4_address_data_set,
));
/* ---dbus---
* property: routes
@@ -869,14 +869,14 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* property.)
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aau"),
.to_dbus_fcn = ip4_routes_get,
.from_dbus_fcn = ip4_routes_set,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aau"),
.to_dbus_fcn = ip4_routes_get,
.from_dbus_fcn = ip4_routes_set,
));
/* ---dbus---
* property: route-data
@@ -891,13 +891,13 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* also exist on some routes.
* ---end---
*/
_properties_override_add_virt (properties_override,
"route-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip4_route_data_get,
.from_dbus_fcn = ip4_route_data_set,
));
_nm_properties_override_dbus (properties_override,
"route-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip4_route_data_get,
.from_dbus_fcn = ip4_route_data_set,
));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

76
libnm-core/nm-setting-ip6-config.c
View File

@@ -880,14 +880,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* description: Array of IP addresses of DNS servers (in network byte order)
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aay"),
.gprop_to_dbus_fcn = ip6_dns_to_dbus,
.gprop_from_dbus_fcn = ip6_dns_from_dbus,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aay"),
.gprop_to_dbus_fcn = ip6_dns_to_dbus,
.gprop_from_dbus_fcn = ip6_dns_from_dbus,
));
/* ---dbus---
* property: addresses
@@ -903,14 +903,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* that subnet.
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a(ayuay)"),
.to_dbus_fcn = ip6_addresses_get,
.from_dbus_fcn = ip6_addresses_set,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a(ayuay)"),
.to_dbus_fcn = ip6_addresses_get,
.from_dbus_fcn = ip6_addresses_set,
));
/* ---dbus---
* property: address-data
@@ -921,13 +921,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* also exist on some addresses.
* ---end---
*/
_properties_override_add_virt (properties_override,
"address-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip6_address_data_get,
.from_dbus_fcn = ip6_address_data_set,
));
_nm_properties_override_dbus (properties_override,
"address-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip6_address_data_get,
.from_dbus_fcn = ip6_address_data_set,
));
/* ---dbus---
* property: routes
@@ -943,14 +943,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* default metric for the device.
* ---end---
*/
_properties_override_add_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a(ayuayu)"),
.to_dbus_fcn = ip6_routes_get,
.from_dbus_fcn = ip6_routes_set,
));
_nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a(ayuayu)"),
.to_dbus_fcn = ip6_routes_get,
.from_dbus_fcn = ip6_routes_set,
));
/* ---dbus---
* property: route-data
@@ -965,13 +965,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* also exist on some routes.
* ---end---
*/
_properties_override_add_virt (properties_override,
"route-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip6_route_data_get,
.from_dbus_fcn = ip6_route_data_set,
));
_nm_properties_override_dbus (properties_override,
"route-data",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = ip6_route_data_get,
.from_dbus_fcn = ip6_route_data_set,
));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

2
libnm-core/nm-setting-olpc-mesh.c
View File

@@ -250,7 +250,7 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_DHCP_ANYCAST_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_DHCP_ANYCAST_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

32
libnm-core/nm-setting-private.h
View File

@@ -157,30 +157,30 @@ _nm_setting_class_commit (NMSettingClass *setting_class,
__VA_ARGS__ \
}))
gboolean _properties_override_add_assert (const NMSettInfoProperty *prop_info);
gboolean _nm_properties_override_assert (const NMSettInfoProperty *prop_info);
static inline void
_properties_override_add (GArray *properties_override,
const NMSettInfoProperty *prop_info)
_nm_properties_override (GArray *properties_override,
const NMSettInfoProperty *prop_info)
{
nm_assert (properties_override);
nm_assert (_properties_override_add_assert (prop_info));
nm_assert (_nm_properties_override_assert (prop_info));
g_array_append_vals (properties_override, prop_info, 1);
}
#define _properties_override_add_gobj(properties_override, p_param_spec, p_property_type) \
_properties_override_add ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.param_spec = (p_param_spec), \
.property_type = (p_property_type), \
))
#define _nm_properties_override_gobj(properties_override, p_param_spec, p_property_type) \
_nm_properties_override ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.param_spec = (p_param_spec), \
.property_type = (p_property_type), \
))
#define _properties_override_add_virt(properties_override, p_name, p_property_type) \
_properties_override_add ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.name = (""p_name""), \
.property_type = (p_property_type), \
))
#define _nm_properties_override_dbus(properties_override, p_name, p_property_type) \
_nm_properties_override ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.name = (""p_name""), \
.property_type = (p_property_type), \
))
/*****************************************************************************/

14
libnm-core/nm-setting-serial.c
View File

@@ -288,13 +288,13 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_PARITY],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BYTE,
.gprop_to_dbus_fcn = parity_to_dbus,
.gprop_from_dbus_fcn = parity_from_dbus,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_PARITY],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BYTE,
.gprop_to_dbus_fcn = parity_to_dbus,
.gprop_from_dbus_fcn = parity_from_dbus,
));
/**
* NMSettingSerial:stopbits:

14
libnm-core/nm-setting-sriov.c
View File

@@ -1326,13 +1326,13 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_VFS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = vfs_to_dbus,
.from_dbus_fcn = vfs_from_dbus,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_VFS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = vfs_to_dbus,
.from_dbus_fcn = vfs_from_dbus,
));
/**
* NMSettingSriov:autoprobe-drivers

28
libnm-core/nm-setting-tc-config.c
View File

@@ -1800,13 +1800,13 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_QDISCS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = tc_qdiscs_get,
.from_dbus_fcn = tc_qdiscs_set,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_QDISCS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = tc_qdiscs_get,
.from_dbus_fcn = tc_qdiscs_set,
));
/**
* NMSettingTCConfig:tfilters: (type GPtrArray(NMTCTfilter))
@@ -1826,13 +1826,13 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_TFILTERS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = tc_tfilters_get,
.from_dbus_fcn = tc_tfilters_set,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_TFILTERS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = tc_tfilters_get,
.from_dbus_fcn = tc_tfilters_set,
));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

14
libnm-core/nm-setting-team-port.c
View File

@@ -556,7 +556,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_CONFIG], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_CONFIG], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeamPort:queue-id:
@@ -571,7 +571,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_QUEUE_ID], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_QUEUE_ID], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeamPort:prio:
@@ -585,7 +585,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, 0,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_PRIO], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_PRIO], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeamPort:sticky:
@@ -599,7 +599,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
FALSE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_STICKY], &nm_sett_info_propert_type_team_b);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_STICKY], &nm_sett_info_propert_type_team_b);
/**
* NMSettingTeamPort:lacp-prio:
@@ -613,7 +613,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_PRIO], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_PRIO], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeamPort:lacp-key:
@@ -627,7 +627,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_KEY], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_KEY], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -648,7 +648,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS], &nm_sett_info_propert_type_team_link_watchers);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS], &nm_sett_info_propert_type_team_link_watchers);
g_object_class_install_properties (object_class, G_N_ELEMENTS (obj_properties), obj_properties);

34
libnm-core/nm-setting-team.c
View File

@@ -1503,7 +1503,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_CONFIG], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_CONFIG], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeam:notify-peers-count:
@@ -1517,7 +1517,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:notify-peers-interval:
@@ -1531,7 +1531,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:mcast-rejoin-count:
@@ -1545,7 +1545,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:mcast-rejoin-interval:
@@ -1559,7 +1559,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:runner:
@@ -1575,7 +1575,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeam:runner-hwaddr-policy:
@@ -1589,7 +1589,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeam:runner-tx-hash:
@@ -1604,7 +1604,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH], &nm_sett_info_propert_type_team_as);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH], &nm_sett_info_propert_type_team_as);
/**
* NMSettingTeam:runner-tx-balancer:
@@ -1618,7 +1618,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeam:runner-tx-balancer-interval:
@@ -1632,7 +1632,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:runner-active:
@@ -1646,7 +1646,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
TRUE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE], &nm_sett_info_propert_type_team_b);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE], &nm_sett_info_propert_type_team_b);
/**
* NMSettingTeam:runner-fast-rate:
@@ -1660,7 +1660,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
FALSE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE], &nm_sett_info_propert_type_team_b);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE], &nm_sett_info_propert_type_team_b);
/**
* NMSettingTeam:runner-sys-prio:
@@ -1674,7 +1674,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:runner-min-ports:
@@ -1688,7 +1688,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS], &nm_sett_info_propert_type_team_i);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS], &nm_sett_info_propert_type_team_i);
/**
* NMSettingTeam:runner-agg-select-policy:
@@ -1702,7 +1702,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY], &nm_sett_info_propert_type_team_s);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY], &nm_sett_info_propert_type_team_s);
/**
* NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -1723,7 +1723,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS], &nm_sett_info_propert_type_team_link_watchers);
_nm_properties_override_gobj (properties_override, obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS], &nm_sett_info_propert_type_team_link_watchers);
/* ---dbus---
* property: interface-name
@@ -1733,7 +1733,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* team's interface name.
* ---end---
*/
_properties_override_add_virt (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
_nm_properties_override_dbus (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
g_object_class_install_properties (object_class, G_N_ELEMENTS (obj_properties), obj_properties);

2
libnm-core/nm-setting-user.c
View File

@@ -571,7 +571,7 @@ nm_setting_user_class_init (NMSettingUserClass *klass)
G_TYPE_HASH_TABLE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_DATA], &nm_sett_info_propert_type_strdict);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_DATA], &nm_sett_info_propert_type_strdict);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

16
libnm-core/nm-setting-vlan.c
View File

@@ -908,13 +908,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_FLAGS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32,
.to_dbus_fcn = _override_flags_get,
.missing_from_dbus_fcn = _override_flags_not_set,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_FLAGS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32,
.to_dbus_fcn = _override_flags_get,
.missing_from_dbus_fcn = _override_flags_not_set,
));
/**
* NMSettingVlan:ingress-priority-map:
@@ -974,7 +974,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* vlan's interface name.
* ---end---
*/
_properties_override_add_virt (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
_nm_properties_override_dbus (properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

16
libnm-core/nm-setting-vpn.c
View File

@@ -1129,7 +1129,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
G_TYPE_HASH_TABLE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_DATA], &nm_sett_info_propert_type_strdict);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_DATA], &nm_sett_info_propert_type_strdict);
/**
* NMSettingVpn:secrets: (type GHashTable(utf8,utf8)):
@@ -1151,13 +1151,13 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_SECRETS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a{ss}"),
.to_dbus_fcn = vpn_secrets_to_dbus,
.from_dbus_fcn = vpn_secrets_from_dbus,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_SECRETS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a{ss}"),
.to_dbus_fcn = vpn_secrets_to_dbus,
.from_dbus_fcn = vpn_secrets_from_dbus,
));
/**
* NMSettingVpn:timeout:

2
libnm-core/nm-setting-wimax.c
View File

@@ -236,7 +236,7 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

20
libnm-core/nm-setting-wired.c
View File

@@ -1306,12 +1306,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_AUTO_NEGOTIATE],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BOOLEAN,
.to_dbus_fcn = _override_autoneg_get,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_AUTO_NEGOTIATE],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BOOLEAN,
.to_dbus_fcn = _override_autoneg_get,
));
/**
* NMSettingWired:mac-address:
@@ -1343,7 +1343,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingWired:cloned-mac-address:
@@ -1394,7 +1394,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_CLONED_MAC_ADDRESS], &nm_sett_info_propert_type_cloned_mac_address);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_CLONED_MAC_ADDRESS], &nm_sett_info_propert_type_cloned_mac_address);
/* ---dbus---
* property: assigned-mac-address
@@ -1408,7 +1408,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* "cloned-mac-address".
* ---end---
*/
_properties_override_add_virt (properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address);
_nm_properties_override_dbus (properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address);
/**
* NMSettingWired:generate-mac-address-mask:
@@ -1572,7 +1572,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_S390_OPTIONS], &nm_sett_info_propert_type_strdict);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_S390_OPTIONS], &nm_sett_info_propert_type_strdict);
/**
* NMSettingWired:wake-on-lan:

14
libnm-core/nm-setting-wireguard.c
View File

@@ -2571,13 +2571,13 @@ nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass)
* description: Array of dictionaries for the WireGuard peers.
* ---end---
*/
_properties_override_add_virt (properties_override,
NM_SETTING_WIREGUARD_PEERS,
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = _peers_dbus_only_synth,
.from_dbus_fcn = _peers_dbus_only_set,
));
_nm_properties_override_dbus (properties_override,
NM_SETTING_WIREGUARD_PEERS,
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
.to_dbus_fcn = _peers_dbus_only_synth,
.from_dbus_fcn = _peers_dbus_only_set,
));
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

12
libnm-core/nm-setting-wireless-security.c
View File

@@ -1811,12 +1811,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_WEP_KEY_TYPE],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32,
.gprop_to_dbus_fcn = wep_key_type_to_dbus,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_WEP_KEY_TYPE],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32,
.gprop_to_dbus_fcn = wep_key_type_to_dbus,
));
/**
* NMSettingWirelessSecurity:wps-method:

32
libnm-core/nm-setting-wireless.c
View File

@@ -1376,7 +1376,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_BSSID], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_BSSID], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingWireless:rate:
@@ -1450,7 +1450,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
NULL,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_MAC_ADDRESS], &nm_sett_info_propert_type_mac_addrees);
/**
* NMSettingWireless:cloned-mac-address:
@@ -1500,7 +1500,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, obj_properties[PROP_CLONED_MAC_ADDRESS], &nm_sett_info_propert_type_cloned_mac_address);
_nm_properties_override_gobj (properties_override, obj_properties[PROP_CLONED_MAC_ADDRESS], &nm_sett_info_propert_type_cloned_mac_address);
/* ---dbus---
* property: assigned-mac-address
@@ -1514,7 +1514,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* "cloned-mac-address".
* ---end---
*/
_properties_override_add_virt (properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address);
_nm_properties_override_dbus (properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address);
/**
* NMSettingWireless:generate-mac-address-mask:
@@ -1611,12 +1611,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
G_PARAM_READWRITE |
NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override,
obj_properties[PROP_SEEN_BSSIDS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
.to_dbus_fcn = _to_dbus_fcn_seen_bssids,
));
_nm_properties_override_gobj (properties_override,
obj_properties[PROP_SEEN_BSSIDS],
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
.to_dbus_fcn = _to_dbus_fcn_seen_bssids,
));
/**
* NMSettingWireless:mtu:
@@ -1734,12 +1734,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* NetworkManager daemons.
* ---end---
*/
_properties_override_add_virt (properties_override,
"security",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.to_dbus_fcn = nm_setting_wireless_get_security,
));
_nm_properties_override_dbus (properties_override,
"security",
NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING,
.to_dbus_fcn = nm_setting_wireless_get_security,
));
/**
* NMSettingWireless:wake-on-wlan:

2
libnm-core/nm-setting.c
View File

@@ -203,7 +203,7 @@ _gprop_to_dbus_fcn_flags (const GValue *val)
}
gboolean
_properties_override_add_assert (const NMSettInfoProperty *prop_info)
_nm_properties_override_assert (const NMSettInfoProperty *prop_info)
{
nm_assert (prop_info);
nm_assert ((!!prop_info->name) != (!!prop_info->param_spec));