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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * 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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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--- /* ---dbus---
* property: interface-name * property: interface-name
@@ -980,7 +980,7 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
* bond's interface name. * bond's interface name.
* ---end--- * ---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); 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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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); 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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingBridge:stp:
@@ -1461,7 +1461,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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--- /* ---dbus---
* property: interface-name * property: interface-name
@@ -1471,7 +1471,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
* bridge's interface name. * bridge's interface name.
* ---end--- * ---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); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -1735,7 +1735,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_INTERFACE_NAME], obj_properties[PROP_INTERFACE_NAME],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING, .dbus_type = G_VARIANT_TYPE_STRING,
@@ -1920,7 +1920,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_TIMESTAMP], obj_properties[PROP_TIMESTAMP],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT64, .dbus_type = G_VARIANT_TYPE_UINT64,

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

@@ -1103,7 +1103,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingDcb:priority-group-flags:
@@ -1146,7 +1146,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingDcb:priority-group-bandwidth: (type GArray(guint))
@@ -1168,7 +1168,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingDcb:priority-bandwidth: (type GArray(guint))
@@ -1192,7 +1192,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean))
@@ -1214,7 +1214,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingDcb:priority-traffic-class: (type GArray(guint))
@@ -1235,7 +1235,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
G_TYPE_ARRAY, G_TYPE_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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); 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); G_PARAM_STATIC_STRINGS);
/* Ignore incoming deprecated properties */ /* Ignore incoming deprecated properties */
_properties_override_add_virt (properties_override, "allowed-bands", &nm_sett_info_propert_type_deprecated_ignore_u); _nm_properties_override_dbus (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, "network-type", &nm_sett_info_propert_type_deprecated_ignore_i);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); 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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingInfiniband:mtu:

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

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

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

@@ -796,7 +796,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* integers) * integers)
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS), NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -820,7 +820,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* for that subnet. * for that subnet.
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES), NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -828,7 +828,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
.to_dbus_fcn = ip4_addresses_get, .to_dbus_fcn = ip4_addresses_get,
.from_dbus_fcn = ip4_addresses_set, .from_dbus_fcn = ip4_addresses_set,
)); ));
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"address-labels", "address-labels",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY, .dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
@@ -844,7 +844,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* also exist on some addresses. * also exist on some addresses.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"address-data", "address-data",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
@@ -869,7 +869,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* property.) * property.)
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES), NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -891,7 +891,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
* also exist on some routes. * also exist on some routes.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"route-data", "route-data",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),

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

@@ -880,7 +880,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* description: Array of IP addresses of DNS servers (in network byte order) * description: Array of IP addresses of DNS servers (in network byte order)
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_DNS), NM_SETTING_IP_CONFIG_DNS),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -903,7 +903,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* that subnet. * that subnet.
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ADDRESSES), NM_SETTING_IP_CONFIG_ADDRESSES),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -921,7 +921,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* also exist on some addresses. * also exist on some addresses.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"address-data", "address-data",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
@@ -943,7 +943,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* default metric for the device. * default metric for the device.
* ---end--- * ---end---
*/ */
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
g_object_class_find_property (G_OBJECT_CLASS (setting_class), g_object_class_find_property (G_OBJECT_CLASS (setting_class),
NM_SETTING_IP_CONFIG_ROUTES), NM_SETTING_IP_CONFIG_ROUTES),
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
@@ -965,7 +965,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
* also exist on some routes. * also exist on some routes.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"route-data", "route-data",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),

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

@@ -250,7 +250,7 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

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

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

@@ -288,7 +288,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_PARITY], obj_properties[PROP_PARITY],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BYTE, .dbus_type = G_VARIANT_TYPE_BYTE,

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

@@ -1326,7 +1326,7 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_VFS], obj_properties[PROP_VFS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),

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

@@ -1800,7 +1800,7 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_QDISCS], obj_properties[PROP_QDISCS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),
@@ -1826,7 +1826,7 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_TFILTERS], obj_properties[PROP_TFILTERS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),

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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeamPort:queue-id:
@@ -571,7 +571,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeamPort:prio:
@@ -585,7 +585,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, 0, G_MININT32, G_MAXINT32, 0,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeamPort:sticky:
@@ -599,7 +599,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeamPort:lacp-prio:
@@ -613,7 +613,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeamPort:lacp-key:
@@ -627,7 +627,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -648,7 +648,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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); 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 | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:notify-peers-count:
@@ -1517,7 +1517,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:notify-peers-interval:
@@ -1531,7 +1531,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:mcast-rejoin-count:
@@ -1545,7 +1545,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:mcast-rejoin-interval:
@@ -1559,7 +1559,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner:
@@ -1575,7 +1575,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-hwaddr-policy:
@@ -1589,7 +1589,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-tx-hash:
@@ -1604,7 +1604,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-tx-balancer:
@@ -1618,7 +1618,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-tx-balancer-interval:
@@ -1632,7 +1632,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-active:
@@ -1646,7 +1646,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-fast-rate:
@@ -1660,7 +1660,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-sys-prio:
@@ -1674,7 +1674,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-min-ports:
@@ -1688,7 +1688,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_MININT32, G_MAXINT32, -1, G_MININT32, G_MAXINT32, -1,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingTeam:runner-agg-select-policy:
@@ -1702,7 +1702,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)) * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -1723,7 +1723,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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--- /* ---dbus---
* property: interface-name * property: interface-name
@@ -1733,7 +1733,7 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
* team's interface name. * team's interface name.
* ---end--- * ---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); 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_TYPE_HASH_TABLE,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -908,7 +908,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_FLAGS], obj_properties[PROP_FLAGS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32, .dbus_type = G_VARIANT_TYPE_UINT32,
@@ -974,7 +974,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
* vlan's interface name. * vlan's interface name.
* ---end--- * ---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); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -1129,7 +1129,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
G_TYPE_HASH_TABLE, G_TYPE_HASH_TABLE,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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)): * NMSettingVpn:secrets: (type GHashTable(utf8,utf8)):
@@ -1151,7 +1151,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_SECRET | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_SECRETS], obj_properties[PROP_SECRETS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("a{ss}"), .dbus_type = NM_G_VARIANT_TYPE ("a{ss}"),

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

@@ -236,7 +236,7 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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); g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);

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

@@ -1306,7 +1306,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_AUTO_NEGOTIATE], obj_properties[PROP_AUTO_NEGOTIATE],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_BOOLEAN, .dbus_type = G_VARIANT_TYPE_BOOLEAN,
@@ -1343,7 +1343,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingWired:cloned-mac-address:
@@ -1394,7 +1394,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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--- /* ---dbus---
* property: assigned-mac-address * property: assigned-mac-address
@@ -1408,7 +1408,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
* "cloned-mac-address". * "cloned-mac-address".
* ---end--- * ---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: * NMSettingWired:generate-mac-address-mask:
@@ -1572,7 +1572,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingWired:wake-on-lan:

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

@@ -2571,7 +2571,7 @@ nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass)
* description: Array of dictionaries for the WireGuard peers. * description: Array of dictionaries for the WireGuard peers.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
NM_SETTING_WIREGUARD_PEERS, NM_SETTING_WIREGUARD_PEERS,
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"), .dbus_type = NM_G_VARIANT_TYPE ("aa{sv}"),

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

@@ -1811,7 +1811,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_WEP_KEY_TYPE], obj_properties[PROP_WEP_KEY_TYPE],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_UINT32, .dbus_type = G_VARIANT_TYPE_UINT32,

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

@@ -1376,7 +1376,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingWireless:rate:
@@ -1450,7 +1450,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS); 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: * NMSettingWireless:cloned-mac-address:
@@ -1500,7 +1500,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); 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--- /* ---dbus---
* property: assigned-mac-address * property: assigned-mac-address
@@ -1514,7 +1514,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* "cloned-mac-address". * "cloned-mac-address".
* ---end--- * ---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: * NMSettingWireless:generate-mac-address-mask:
@@ -1611,7 +1611,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);
_properties_override_add_gobj (properties_override, _nm_properties_override_gobj (properties_override,
obj_properties[PROP_SEEN_BSSIDS], obj_properties[PROP_SEEN_BSSIDS],
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING_ARRAY, .dbus_type = G_VARIANT_TYPE_STRING_ARRAY,
@@ -1734,7 +1734,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
* NetworkManager daemons. * NetworkManager daemons.
* ---end--- * ---end---
*/ */
_properties_override_add_virt (properties_override, _nm_properties_override_dbus (properties_override,
"security", "security",
NM_SETT_INFO_PROPERT_TYPE ( NM_SETT_INFO_PROPERT_TYPE (
.dbus_type = G_VARIANT_TYPE_STRING, .dbus_type = G_VARIANT_TYPE_STRING,

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

@@ -203,7 +203,7 @@ _gprop_to_dbus_fcn_flags (const GValue *val)
} }
gboolean 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);
nm_assert ((!!prop_info->name) != (!!prop_info->param_spec)); nm_assert ((!!prop_info->name) != (!!prop_info->param_spec));