summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-06-17 22:53:52 +0200
committerThomas Haller <thaller@redhat.com>2021-06-23 12:47:38 +0200
commit22edf34ba3b794c8d6b7fbf6b9743e2898a98a27 (patch)
tree1d42d4f9c5f65ed9b9c30583a0ccb4eec666acea
parentd5c4378cdf732a75862e81c8c85c23012cf080b2 (diff)
libnm: use _nm_setting_property_define_boolean() for boolean NMSetting properties
-rw-r--r--src/libnm-core-impl/nm-setting-8021x.c36
-rw-r--r--src/libnm-core-impl/nm-setting-bridge-port.c13
-rw-r--r--src/libnm-core-impl/nm-setting-bridge.c78
-rw-r--r--src/libnm-core-impl/nm-setting-connection.c13
-rw-r--r--src/libnm-core-impl/nm-setting-gsm.c26
-rw-r--r--src/libnm-core-impl/nm-setting-ip-config.c30
-rw-r--r--src/libnm-core-impl/nm-setting-ip-tunnel.c23
-rw-r--r--src/libnm-core-impl/nm-setting-macsec.c35
-rw-r--r--src/libnm-core-impl/nm-setting-macvlan.c36
-rw-r--r--src/libnm-core-impl/nm-setting-ovs-bridge.c49
-rw-r--r--src/libnm-core-impl/nm-setting-ppp.c177
-rw-r--r--src/libnm-core-impl/nm-setting-proxy.c23
-rw-r--r--src/libnm-core-impl/nm-setting-tun.c49
-rw-r--r--src/libnm-core-impl/nm-setting-vpn.c13
-rw-r--r--src/libnm-core-impl/nm-setting-vxlan.c77
-rw-r--r--src/libnm-core-impl/nm-setting-wireguard.c13
-rw-r--r--src/libnm-core-impl/nm-setting-wireless.c12
17 files changed, 410 insertions, 293 deletions
diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c
index 78a31e9c39..6ddbd68066 100644
--- a/src/libnm-core-impl/nm-setting-8021x.c
+++ b/src/libnm-core-impl/nm-setting-8021x.c
@@ -3513,8 +3513,9 @@ finalize(GObject *object)
static void
nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSetting8021xPrivate));
@@ -4587,12 +4588,13 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* description: a boolean value.
* ---end---
*/
- obj_properties[PROP_SYSTEM_CA_CERTS] =
- g_param_spec_boolean(NM_SETTING_802_1X_SYSTEM_CA_CERTS,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_802_1X_SYSTEM_CA_CERTS,
+ PROP_SYSTEM_CA_CERTS,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_802_1x_get_system_ca_certs);
/**
* NMSetting8021x:auth-timeout:
@@ -4636,14 +4638,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
* description: whether the 802.1X authentication is optional
* ---end---
*/
- obj_properties[PROP_OPTIONAL] =
- g_param_spec_boolean(NM_SETTING_802_1X_OPTIONAL,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_802_1X_OPTIONAL,
+ PROP_OPTIONAL,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_802_1x_get_optional);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_802_1X);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_802_1X,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-bridge-port.c b/src/libnm-core-impl/nm-setting-bridge-port.c
index 9efb1563c3..33d0c00915 100644
--- a/src/libnm-core-impl/nm-setting-bridge-port.c
+++ b/src/libnm-core-impl/nm-setting-bridge-port.c
@@ -564,12 +564,13 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass)
* description: Hairpin mode of the bridge port.
* ---end---
*/
- obj_properties[PROP_HAIRPIN_MODE] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
+ PROP_HAIRPIN_MODE,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_port_get_hairpin_mode);
/**
* NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan))
diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c
index e606432afe..e987310f6f 100644
--- a/src/libnm-core-impl/nm-setting-bridge.c
+++ b/src/libnm-core-impl/nm-setting-bridge.c
@@ -1672,12 +1672,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: Span tree protocol participation.
* ---end---
*/
- obj_properties[PROP_STP] = g_param_spec_boolean(NM_SETTING_BRIDGE_STP,
- "",
- "",
- NM_BRIDGE_STP_DEF,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
- | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_STP,
+ PROP_STP,
+ NM_BRIDGE_STP_DEF,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_stp);
/**
* NMSettingBridge:priority:
@@ -1830,12 +1831,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: IGMP snooping support.
* ---end---
*/
- obj_properties[PROP_MULTICAST_SNOOPING] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
- "",
- "",
- NM_BRIDGE_MULTICAST_SNOOPING_DEF,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
+ PROP_MULTICAST_SNOOPING,
+ NM_BRIDGE_MULTICAST_SNOOPING_DEF,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_multicast_snooping);
/**
* NMSettingBridge:vlan-filtering:
@@ -1852,12 +1854,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
* description: VLAN filtering support.
* ---end---
*/
- obj_properties[PROP_VLAN_FILTERING] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_VLAN_FILTERING,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_VLAN_FILTERING,
+ PROP_VLAN_FILTERING,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_vlan_filtering);
/**
* NMSettingBridge:vlan-default-pvid:
@@ -1998,12 +2001,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
- obj_properties[PROP_VLAN_STATS_ENABLED] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
- "",
- "",
- NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_VLAN_STATS_ENABLED,
+ PROP_VLAN_STATS_ENABLED,
+ NM_BRIDGE_VLAN_STATS_ENABLED_DEF,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_vlan_stats_enabled);
/**
* NMSettingBridge:multicast-router:
@@ -2048,12 +2052,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
- obj_properties[PROP_MULTICAST_QUERY_USE_IFADDR] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
- "",
- "",
- NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR,
+ PROP_MULTICAST_QUERY_USE_IFADDR,
+ NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_multicast_query_use_ifaddr);
/**
* NMSettingBridge:multicast-querier:
@@ -2070,12 +2075,13 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass)
*
* Since: 1.24
*/
- obj_properties[PROP_MULTICAST_QUERIER] = g_param_spec_boolean(
- NM_SETTING_BRIDGE_MULTICAST_QUERIER,
- "",
- "",
- NM_BRIDGE_MULTICAST_QUERIER_DEF,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_BRIDGE_MULTICAST_QUERIER,
+ PROP_MULTICAST_QUERIER,
+ NM_BRIDGE_MULTICAST_QUERIER_DEF,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_bridge_get_multicast_querier);
/**
* NMSettingBridge:multicast-hash-max:
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 9f78cff022..6b45568c47 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -2200,12 +2200,13 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* service's D-Bus interface with the right privileges, or %TRUE if the
* connection is read-only and cannot be modified.
**/
- obj_properties[PROP_READ_ONLY] = g_param_spec_boolean(
- NM_SETTING_CONNECTION_READ_ONLY,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_CONNECTION_READ_ONLY,
+ PROP_READ_ONLY,
+ FALSE,
+ NM_SETTING_PARAM_FUZZY_IGNORE,
+ nm_setting_connection_get_read_only);
/**
* NMSettingConnection:zone:
diff --git a/src/libnm-core-impl/nm-setting-gsm.c b/src/libnm-core-impl/nm-setting-gsm.c
index a1f0500e4d..a177f7fb8c 100644
--- a/src/libnm-core-impl/nm-setting-gsm.c
+++ b/src/libnm-core-impl/nm-setting-gsm.c
@@ -667,12 +667,13 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass)
*
* Since: 1.22
**/
- obj_properties[PROP_AUTO_CONFIG] =
- g_param_spec_boolean(NM_SETTING_GSM_AUTO_CONFIG,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_GSM_AUTO_CONFIG,
+ PROP_AUTO_CONFIG,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_gsm_get_auto_config);
/**
* NMSettingGsm:number:
@@ -793,12 +794,13 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass)
* When %TRUE, only connections to the home network will be allowed.
* Connections to roaming networks will not be made.
**/
- obj_properties[PROP_HOME_ONLY] =
- g_param_spec_boolean(NM_SETTING_GSM_HOME_ONLY,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_GSM_HOME_ONLY,
+ PROP_HOME_ONLY,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_gsm_get_home_only);
/**
* NMSettingGsm:device-id:
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
index 05c60d074f..b68e01309e 100644
--- a/src/libnm-core-impl/nm-setting-ip-config.c
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
@@ -5784,6 +5784,36 @@ _nm_sett_info_property_override_create_array_ip_config(void)
.to_dbus_fcn = _routing_rules_dbus_only_synth,
.from_dbus_fcn = _routing_rules_dbus_only_set, ));
+ _nm_properties_override_gobj(properties_override,
+ obj_properties[PROP_IGNORE_AUTO_ROUTES],
+ &nm_sett_info_propert_type_boolean,
+ .to_dbus_data.get_boolean = (gboolean(*)(
+ NMSetting *)) nm_setting_ip_config_get_ignore_auto_routes);
+
+ _nm_properties_override_gobj(properties_override,
+ obj_properties[PROP_IGNORE_AUTO_DNS],
+ &nm_sett_info_propert_type_boolean,
+ .to_dbus_data.get_boolean = (gboolean(*)(
+ NMSetting *)) nm_setting_ip_config_get_ignore_auto_dns);
+
+ _nm_properties_override_gobj(properties_override,
+ obj_properties[PROP_DHCP_SEND_HOSTNAME],
+ &nm_sett_info_propert_type_boolean,
+ .to_dbus_data.get_boolean = (gboolean(*)(
+ NMSetting *)) nm_setting_ip_config_get_dhcp_send_hostname);
+
+ _nm_properties_override_gobj(properties_override,
+ obj_properties[PROP_NEVER_DEFAULT],
+ &nm_sett_info_propert_type_boolean,
+ .to_dbus_data.get_boolean = (gboolean(*)(
+ NMSetting *)) nm_setting_ip_config_get_never_default);
+
+ _nm_properties_override_gobj(properties_override,
+ obj_properties[PROP_MAY_FAIL],
+ &nm_sett_info_propert_type_boolean,
+ .to_dbus_data.get_boolean =
+ (gboolean(*)(NMSetting *)) nm_setting_ip_config_get_may_fail);
+
return properties_override;
}
diff --git a/src/libnm-core-impl/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c
index 68135eea81..e6cb00fea5 100644
--- a/src/libnm-core-impl/nm-setting-ip-tunnel.c
+++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c
@@ -654,8 +654,9 @@ finalize(GObject *object)
static void
nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingIPTunnelPrivate));
@@ -769,12 +770,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_PATH_MTU_DISCOVERY] = g_param_spec_boolean(
- NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY,
+ PROP_PATH_MTU_DISCOVERY,
+ TRUE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_ip_tunnel_get_path_mtu_discovery);
/**
* NMSettingIPTunnel:input-key:
@@ -879,5 +881,8 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_IP_TUNNEL);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_IP_TUNNEL,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c
index 9593419304..55024bb4c2 100644
--- a/src/libnm-core-impl/nm-setting-macsec.c
+++ b/src/libnm-core-impl/nm-setting-macsec.c
@@ -529,8 +529,9 @@ finalize(GObject *object)
static void
nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingMacsecPrivate));
@@ -582,11 +583,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
*
* Since: 1.6
**/
- obj_properties[PROP_ENCRYPT] = g_param_spec_boolean(NM_SETTING_MACSEC_ENCRYPT,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_MACSEC_ENCRYPT,
+ PROP_ENCRYPT,
+ TRUE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_macsec_get_encrypt);
/**
* NMSettingMacsec:mka-cak:
@@ -673,14 +676,18 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
*
* Since: 1.12
**/
- obj_properties[PROP_SEND_SCI] =
- g_param_spec_boolean(NM_SETTING_MACSEC_SEND_SCI,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_MACSEC_SEND_SCI,
+ PROP_SEND_SCI,
+ TRUE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_macsec_get_send_sci);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_MACSEC);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_MACSEC,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-macvlan.c b/src/libnm-core-impl/nm-setting-macvlan.c
index 98f943e9cd..9cb2b2621f 100644
--- a/src/libnm-core-impl/nm-setting-macvlan.c
+++ b/src/libnm-core-impl/nm-setting-macvlan.c
@@ -269,8 +269,9 @@ finalize(GObject *object)
static void
nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingMacvlanPrivate));
@@ -321,12 +322,13 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_PROMISCUOUS] = g_param_spec_boolean(
- NM_SETTING_MACVLAN_PROMISCUOUS,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_MACVLAN_PROMISCUOUS,
+ PROP_PROMISCUOUS,
+ TRUE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_macvlan_get_promiscuous);
/**
* NMSettingMacvlan:tap:
@@ -335,14 +337,18 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_TAP] = g_param_spec_boolean(NM_SETTING_MACVLAN_TAP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
- | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_MACVLAN_TAP,
+ PROP_TAP,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_macvlan_get_tap);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_MACVLAN);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_MACVLAN,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-ovs-bridge.c b/src/libnm-core-impl/nm-setting-ovs-bridge.c
index 9d67231b93..22738d204d 100644
--- a/src/libnm-core-impl/nm-setting-ovs-bridge.c
+++ b/src/libnm-core-impl/nm-setting-ovs-bridge.c
@@ -289,8 +289,9 @@ finalize(GObject *object)
static void
nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
object_class->get_property = get_property;
object_class->set_property = set_property;
@@ -319,12 +320,13 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
*
* Since: 1.10
**/
- obj_properties[PROP_MCAST_SNOOPING_ENABLE] =
- g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
+ PROP_MCAST_SNOOPING_ENABLE,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ovs_bridge_get_mcast_snooping_enable);
/**
* NMSettingOvsBridge:rstp-enable:
@@ -333,12 +335,13 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
*
* Since: 1.10
**/
- obj_properties[PROP_RSTP_ENABLE] =
- g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_RSTP_ENABLE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_OVS_BRIDGE_RSTP_ENABLE,
+ PROP_RSTP_ENABLE,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ovs_bridge_get_rstp_enable);
/**
* NMSettingOvsBridge:stp-enable:
@@ -347,12 +350,13 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
*
* Since: 1.10
**/
- obj_properties[PROP_STP_ENABLE] =
- g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_STP_ENABLE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_OVS_BRIDGE_STP_ENABLE,
+ PROP_STP_ENABLE,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ovs_bridge_get_stp_enable);
/**
* NMSettingOvsBridge:datapath-type:
@@ -370,5 +374,8 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass)
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_OVS_BRIDGE);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_OVS_BRIDGE,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-ppp.c b/src/libnm-core-impl/nm-setting-ppp.c
index 73ffad647e..cc722c4456 100644
--- a/src/libnm-core-impl/nm-setting-ppp.c
+++ b/src/libnm-core-impl/nm-setting-ppp.c
@@ -534,8 +534,9 @@ nm_setting_ppp_new(void)
static void
nm_setting_ppp_class_init(NMSettingPppClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingPppPrivate));
@@ -551,107 +552,117 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* authenticate itself to the client. If %FALSE, require authentication
* from the remote side. In almost all cases, this should be %TRUE.
**/
- obj_properties[PROP_NOAUTH] = g_param_spec_boolean(NM_SETTING_PPP_NOAUTH,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_NOAUTH,
+ PROP_NOAUTH,
+ TRUE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_noauth);
/**
* NMSettingPpp:refuse-eap:
*
* If %TRUE, the EAP authentication method will not be used.
**/
- obj_properties[PROP_REFUSE_EAP] =
- g_param_spec_boolean(NM_SETTING_PPP_REFUSE_EAP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REFUSE_EAP,
+ PROP_REFUSE_EAP,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_refuse_eap);
/**
* NMSettingPpp:refuse-pap:
*
* If %TRUE, the PAP authentication method will not be used.
**/
- obj_properties[PROP_REFUSE_PAP] =
- g_param_spec_boolean(NM_SETTING_PPP_REFUSE_PAP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REFUSE_PAP,
+ PROP_REFUSE_PAP,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_refuse_pap);
/**
* NMSettingPpp:refuse-chap:
*
* If %TRUE, the CHAP authentication method will not be used.
**/
- obj_properties[PROP_REFUSE_CHAP] =
- g_param_spec_boolean(NM_SETTING_PPP_REFUSE_CHAP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REFUSE_CHAP,
+ PROP_REFUSE_CHAP,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_refuse_chap);
/**
* NMSettingPpp:refuse-mschap:
*
* If %TRUE, the MSCHAP authentication method will not be used.
**/
- obj_properties[PROP_REFUSE_MSCHAP] =
- g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REFUSE_MSCHAP,
+ PROP_REFUSE_MSCHAP,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_refuse_mschap);
/**
* NMSettingPpp:refuse-mschapv2:
*
* If %TRUE, the MSCHAPv2 authentication method will not be used.
**/
- obj_properties[PROP_REFUSE_MSCHAPV2] =
- g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAPV2,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REFUSE_MSCHAPV2,
+ PROP_REFUSE_MSCHAPV2,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_refuse_mschapv2);
/**
* NMSettingPpp:nobsdcomp:
*
* If %TRUE, BSD compression will not be requested.
**/
- obj_properties[PROP_NOBSDCOMP] = g_param_spec_boolean(
- NM_SETTING_PPP_NOBSDCOMP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_NOBSDCOMP,
+ PROP_NOBSDCOMP,
+ FALSE,
+ NM_SETTING_PARAM_FUZZY_IGNORE,
+ nm_setting_ppp_get_nobsdcomp);
/**
* NMSettingPpp:nodeflate:
*
* If %TRUE, "deflate" compression will not be requested.
**/
- obj_properties[PROP_NODEFLATE] = g_param_spec_boolean(
- NM_SETTING_PPP_NODEFLATE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_NODEFLATE,
+ PROP_NODEFLATE,
+ FALSE,
+ NM_SETTING_PARAM_FUZZY_IGNORE,
+ nm_setting_ppp_get_nodeflate);
/**
* NMSettingPpp:no-vj-comp:
*
* If %TRUE, Van Jacobsen TCP header compression will not be requested.
**/
- obj_properties[PROP_NO_VJ_COMP] = g_param_spec_boolean(
- NM_SETTING_PPP_NO_VJ_COMP,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_NO_VJ_COMP,
+ PROP_NO_VJ_COMP,
+ FALSE,
+ NM_SETTING_PARAM_FUZZY_IGNORE,
+ nm_setting_ppp_get_no_vj_comp);
/**
* NMSettingPpp:require-mppe:
@@ -661,12 +672,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* session will fail. Note that MPPE is not used on mobile broadband
* connections.
**/
- obj_properties[PROP_REQUIRE_MPPE] =
- g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REQUIRE_MPPE,
+ PROP_REQUIRE_MPPE,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_require_mppe);
/**
* NMSettingPpp:require-mppe-128:
@@ -675,12 +687,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* required for the PPP session, and the "require-mppe" property must also
* be set to %TRUE. If 128-bit MPPE is not available the session will fail.
**/
- obj_properties[PROP_REQUIRE_MPPE_128] =
- g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE_128,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_REQUIRE_MPPE_128,
+ PROP_REQUIRE_MPPE_128,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_require_mppe_128);
/**
* NMSettingPpp:mppe-stateful:
@@ -688,12 +701,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* If %TRUE, stateful MPPE is used. See pppd documentation for more
* information on stateful MPPE.
**/
- obj_properties[PROP_MPPE_STATEFUL] =
- g_param_spec_boolean(NM_SETTING_PPP_MPPE_STATEFUL,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_MPPE_STATEFUL,
+ PROP_MPPE_STATEFUL,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_mppe_stateful);
/**
* NMSettingPpp:crtscts:
@@ -702,11 +716,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
* flow control with RTS and CTS signals. This value should normally be set
* to %FALSE.
**/
- obj_properties[PROP_CRTSCTS] = g_param_spec_boolean(NM_SETTING_PPP_CRTSCTS,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PPP_CRTSCTS,
+ PROP_CRTSCTS,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_ppp_get_crtscts);
/**
* NMSettingPpp:baud:
@@ -790,5 +806,8 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass)
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_PPP);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_PPP,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-proxy.c b/src/libnm-core-impl/nm-setting-proxy.c
index 50c6cc08aa..fd09e1d402 100644
--- a/src/libnm-core-impl/nm-setting-proxy.c
+++ b/src/libnm-core-impl/nm-setting-proxy.c
@@ -295,8 +295,9 @@ finalize(GObject *object)
static void
nm_setting_proxy_class_init(NMSettingProxyClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingProxyPrivate));
@@ -344,12 +345,13 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass)
* description: Whether the proxy configuration is for browser only.
* ---end---
*/
- obj_properties[PROP_BROWSER_ONLY] =
- g_param_spec_boolean(NM_SETTING_PROXY_BROWSER_ONLY,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_PROXY_BROWSER_ONLY,
+ PROP_BROWSER_ONLY,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_proxy_get_browser_only);
/**
* NMSettingProxy:pac-url:
@@ -394,5 +396,8 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass)
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_PROXY);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_PROXY,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-tun.c b/src/libnm-core-impl/nm-setting-tun.c
index be953e695e..d75dcf80ab 100644
--- a/src/libnm-core-impl/nm-setting-tun.c
+++ b/src/libnm-core-impl/nm-setting-tun.c
@@ -300,8 +300,9 @@ finalize(GObject *object)
static void
nm_setting_tun_class_init(NMSettingTunClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingTunPrivate));
@@ -368,12 +369,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
*
* Since: 1.2
*/
- obj_properties[PROP_PI] = g_param_spec_boolean(NM_SETTING_TUN_PI,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
- | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_TUN_PI,
+ PROP_PI,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_tun_get_pi);
/**
* NMSettingTun:vnet-hdr:
@@ -383,12 +385,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
*
* Since: 1.2
*/
- obj_properties[PROP_VNET_HDR] = g_param_spec_boolean(
- NM_SETTING_TUN_VNET_HDR,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_TUN_VNET_HDR,
+ PROP_VNET_HDR,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_tun_get_vnet_hdr);
/**
* NMSettingTun:multi-queue:
@@ -400,14 +403,18 @@ nm_setting_tun_class_init(NMSettingTunClass *klass)
*
* Since: 1.2
*/
- obj_properties[PROP_MULTI_QUEUE] = g_param_spec_boolean(
- NM_SETTING_TUN_MULTI_QUEUE,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_TUN_MULTI_QUEUE,
+ PROP_MULTI_QUEUE,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_tun_get_multi_queue);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_TUN);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_TUN,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c
index 7b8fdb7644..351f3fd721 100644
--- a/src/libnm-core-impl/nm-setting-vpn.c
+++ b/src/libnm-core-impl/nm-setting-vpn.c
@@ -1172,12 +1172,13 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass)
* the VPN will attempt to stay connected across link changes and outages,
* until explicitly disconnected.
**/
- obj_properties[PROP_PERSISTENT] =
- g_param_spec_boolean(NM_SETTING_VPN_PERSISTENT,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VPN_PERSISTENT,
+ PROP_PERSISTENT,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_vpn_get_persistent);
/**
* NMSettingVpn:data: (type GHashTable(utf8,utf8)):
diff --git a/src/libnm-core-impl/nm-setting-vxlan.c b/src/libnm-core-impl/nm-setting-vxlan.c
index 2a89b0c32e..f2aeb66a16 100644
--- a/src/libnm-core-impl/nm-setting-vxlan.c
+++ b/src/libnm-core-impl/nm-setting-vxlan.c
@@ -570,8 +570,9 @@ finalize(GObject *object)
static void
nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
{
- GObjectClass * object_class = G_OBJECT_CLASS(klass);
- NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GObjectClass * object_class = G_OBJECT_CLASS(klass);
+ NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+ GArray * properties_override = _nm_sett_info_property_override_create_array();
g_type_class_add_private(klass, sizeof(NMSettingVxlanPrivate));
@@ -764,12 +765,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_PROXY] = g_param_spec_boolean(
- NM_SETTING_VXLAN_PROXY,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VXLAN_PROXY,
+ PROP_PROXY,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_vxlan_get_proxy);
/**
* NMSettingVxlan:learning:
@@ -779,12 +781,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_LEARNING] = g_param_spec_boolean(
- NM_SETTING_VXLAN_LEARNING,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VXLAN_LEARNING,
+ PROP_LEARNING,
+ TRUE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_vxlan_get_learning);
+
/**
* NMSettingVxlan:rsc:
*
@@ -792,12 +796,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_RSC] = g_param_spec_boolean(NM_SETTING_VXLAN_RSC,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
- | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VXLAN_RSC,
+ PROP_RSC,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_vxlan_get_rsc);
+
/**
* NMSettingVxlan:l2-miss:
*
@@ -805,12 +811,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_L2_MISS] = g_param_spec_boolean(
- NM_SETTING_VXLAN_L2_MISS,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VXLAN_L2_MISS,
+ PROP_L2_MISS,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_vxlan_get_l2_miss);
/**
* NMSettingVxlan:l3-miss:
@@ -819,14 +826,18 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass)
*
* Since: 1.2
**/
- obj_properties[PROP_L3_MISS] = g_param_spec_boolean(
- NM_SETTING_VXLAN_L3_MISS,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_VXLAN_L3_MISS,
+ PROP_L3_MISS,
+ FALSE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_vxlan_get_l3_miss);
g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
- _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_VXLAN);
+ _nm_setting_class_commit_full(setting_class,
+ NM_META_SETTING_TYPE_VXLAN,
+ NULL,
+ properties_override);
}
diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c
index b5ec0bb88a..3290ff567f 100644
--- a/src/libnm-core-impl/nm-setting-wireguard.c
+++ b/src/libnm-core-impl/nm-setting-wireguard.c
@@ -2514,12 +2514,13 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass)
*
* Since: 1.16
**/
- obj_properties[PROP_PEER_ROUTES] = g_param_spec_boolean(
- NM_SETTING_WIREGUARD_PEER_ROUTES,
- "",
- "",
- TRUE,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_WIREGUARD_PEER_ROUTES,
+ PROP_PEER_ROUTES,
+ TRUE,
+ NM_SETTING_PARAM_INFERRABLE,
+ nm_setting_wireguard_get_peer_routes);
/**
* NMSettingWireGuard:mtu:
diff --git a/src/libnm-core-impl/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c
index e73d8eeb21..111116965a 100644
--- a/src/libnm-core-impl/nm-setting-wireless.c
+++ b/src/libnm-core-impl/nm-setting-wireless.c
@@ -1791,11 +1791,13 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
* description: Whether the network hides the SSID.
* ---end---
*/
- obj_properties[PROP_HIDDEN] = g_param_spec_boolean(NM_SETTING_WIRELESS_HIDDEN,
- "",
- "",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ _nm_setting_property_define_boolean(properties_override,
+ obj_properties,
+ NM_SETTING_WIRELESS_HIDDEN,
+ PROP_HIDDEN,
+ FALSE,
+ NM_SETTING_PARAM_NONE,
+ nm_setting_wireless_get_hidden);
/**
* NMSettingWireless:powersave: