libnm: use _nm_setting_property_define_string() for string NMSetting properties

8 files changed, 214 insertions, 178 deletions

diff --git a/src/libnm-core-impl/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c
index 408b39b5dd..c07fb38e69 100644
--- a/src/libnm-core-impl/nm-setting-6lowpan.c
+++ b/src/libnm-core-impl/nm-setting-6lowpan.c
@@ -196,8 +196,9 @@ finalize(GObject *object)
 static void
 nm_setting_6lowpan_class_init(NMSetting6LowpanClass *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(NMSetting6LowpanPrivate));
 
@@ -215,14 +216,17 @@ nm_setting_6lowpan_class_init(NMSetting6LowpanClass *klass)
      *
      * Since: 1.14
      **/
-    obj_properties[PROP_PARENT] = g_param_spec_string(
-        NM_SETTING_6LOWPAN_PARENT,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_6LOWPAN_PARENT,
+                                       PROP_PARENT,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_6lowpan_get_parent);
 
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
-    _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_6LOWPAN);
+    _nm_setting_class_commit_full(setting_class,
+                                  NM_META_SETTING_TYPE_6LOWPAN,
+                                  NULL,
+                                  properties_override);
 }
diff --git a/src/libnm-core-impl/nm-setting-adsl.c b/src/libnm-core-impl/nm-setting-adsl.c
index 8a82fb724c..9f45163dff 100644
--- a/src/libnm-core-impl/nm-setting-adsl.c
+++ b/src/libnm-core-impl/nm-setting-adsl.c
@@ -351,8 +351,9 @@ finalize(GObject *object)
 static void
 nm_setting_adsl_class_init(NMSettingAdslClass *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(NMSettingAdslPrivate));
 
@@ -369,23 +370,24 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
      *
      * Username used to authenticate with the ADSL service.
      **/
-    obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_ADSL_USERNAME,
-                                                        "",
-                                                        "",
-                                                        NULL,
-                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_ADSL_USERNAME,
+                                       PROP_USERNAME,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_adsl_get_username);
 
     /**
      * NMSettingAdsl:password:
      *
      * Password used to authenticate with the ADSL service.
      **/
-    obj_properties[PROP_PASSWORD] =
-        g_param_spec_string(NM_SETTING_ADSL_PASSWORD,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_ADSL_PASSWORD,
+                                       PROP_PASSWORD,
+                                       NM_SETTING_PARAM_SECRET,
+                                       nm_setting_adsl_get_password);
 
     /**
      * NMSettingAdsl:password-flags:
@@ -405,23 +407,24 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
      *
      * ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
      **/
-    obj_properties[PROP_PROTOCOL] = g_param_spec_string(NM_SETTING_ADSL_PROTOCOL,
-                                                        "",
-                                                        "",
-                                                        NULL,
-                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_ADSL_PROTOCOL,
+                                       PROP_PROTOCOL,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_adsl_get_protocol);
 
     /**
      * NMSettingAdsl:encapsulation:
      *
      * Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
      **/
-    obj_properties[PROP_ENCAPSULATION] =
-        g_param_spec_string(NM_SETTING_ADSL_ENCAPSULATION,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_ADSL_ENCAPSULATION,
+                                       PROP_ENCAPSULATION,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_adsl_get_encapsulation);
 
     /**
      * NMSettingAdsl:vpi:
@@ -451,5 +454,8 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass)
 
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
-    _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_ADSL);
+    _nm_setting_class_commit_full(setting_class,
+                                  NM_META_SETTING_TYPE_ADSL,
+                                  NULL,
+                                  properties_override);
 }
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 6b45568c47..4441d965d9 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -1872,12 +1872,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      * description: User friendly name for the connection profile.
      * ---end---
      */
-    obj_properties[PROP_ID] = g_param_spec_string(NM_SETTING_CONNECTION_ID,
-                                                  "",
-                                                  "",
-                                                  NULL,
-                                                  G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE
-                                                      | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_ID,
+                                       PROP_ID,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE,
+                                       nm_setting_connection_get_id);
 
     /**
      * NMSettingConnection:uuid:
@@ -1902,12 +1902,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      *   creates the UUID itself (by hashing the filename).
      * ---end---
      */
-    obj_properties[PROP_UUID] = g_param_spec_string(
-        NM_SETTING_CONNECTION_UUID,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_UUID,
+                                       PROP_UUID,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE,
+                                       nm_setting_connection_get_uuid);
 
     /**
      * NMSettingConnection:stable-id:
@@ -1986,18 +1986,17 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      *   can be required for some connection types.
      * ---end---
      */
-    obj_properties[PROP_INTERFACE_NAME] = g_param_spec_string(
-        NM_SETTING_CONNECTION_INTERFACE_NAME,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
-    _nm_properties_override_gobj(
+    _nm_setting_property_define_string_full(
         properties_override,
-        obj_properties[PROP_INTERFACE_NAME],
-        NM_SETT_INFO_PROPERT_TYPE_GPROP(G_VARIANT_TYPE_STRING,
-                                        .missing_from_dbus_fcn =
-                                            nm_setting_connection_no_interface_name, ));
+        obj_properties,
+        NM_SETTING_CONNECTION_INTERFACE_NAME,
+        PROP_INTERFACE_NAME,
+        NM_SETTING_PARAM_INFERRABLE,
+        NM_SETT_INFO_PROPERT_TYPE_DBUS(G_VARIANT_TYPE_STRING,
+                                       .to_dbus_fcn = _nm_setting_property_to_dbus_fcn_get_string,
+                                       .missing_from_dbus_fcn =
+                                           nm_setting_connection_no_interface_name),
+        nm_setting_connection_get_interface_name);
 
     /**
      * NMSettingConnection:type:
@@ -2017,12 +2016,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort
      * ---end---
      */
-    obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_CONNECTION_TYPE,
-                                                    "",
-                                                    "",
-                                                    NULL,
-                                                    G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
-                                                        | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_TYPE,
+                                       PROP_TYPE,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_connection_get_connection_type);
 
     /**
      * NMSettingConnection:permissions:
@@ -2227,13 +2226,13 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      * example: ZONE=Work
      * ---end---
      */
-    obj_properties[PROP_ZONE] =
-        g_param_spec_string(NM_SETTING_CONNECTION_ZONE,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE
-                                | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_ZONE,
+                                       PROP_ZONE,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE
+                                           | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY,
+                                       nm_setting_connection_get_zone);
 
     /**
      * NMSettingConnection:master:
@@ -2249,13 +2248,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      *   for compatibility with legacy tooling.
      * ---end---
      */
-    obj_properties[PROP_MASTER] =
-        g_param_spec_string(NM_SETTING_CONNECTION_MASTER,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE
-                                | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_MASTER,
+                                       PROP_MASTER,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_connection_get_master);
 
     /**
      * NMSettingConnection:slave-type:
@@ -2274,13 +2272,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      *   and BRIDGE_UUID for bridging.
      * ---end---
      */
-    obj_properties[PROP_SLAVE_TYPE] =
-        g_param_spec_string(NM_SETTING_CONNECTION_SLAVE_TYPE,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE
-                                | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_SLAVE_TYPE,
+                                       PROP_SLAVE_TYPE,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_connection_get_slave_type);
 
     /**
      * NMSettingConnection:autoconnect-slaves:
@@ -2562,11 +2559,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      * example: https://yourdevice.example.com/model.json
      * ---end---
      */
-    obj_properties[PROP_MUD_URL] = g_param_spec_string(NM_SETTING_CONNECTION_MUD_URL,
-                                                       "",
-                                                       "",
-                                                       NULL,
-                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_CONNECTION_MUD_URL,
+                                       PROP_MUD_URL,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_connection_get_mud_url);
 
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
index b68e01309e..98322281e3 100644
--- a/src/libnm-core-impl/nm-setting-ip-config.c
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
@@ -5768,8 +5768,33 @@ _nm_sett_info_property_override_create_array_ip_config(void)
 
     _nm_properties_override_gobj(
         properties_override,
+        obj_properties[PROP_METHOD],
+        &nm_sett_info_propert_type_string,
+        .to_dbus_data.get_string =
+            (const char *(*) (NMSetting *) ) nm_setting_ip_config_get_method);
+
+    _nm_properties_override_gobj(
+        properties_override,
         obj_properties[PROP_GATEWAY],
-        NM_SETT_INFO_PROPERT_TYPE_GPROP(G_VARIANT_TYPE_STRING, .from_dbus_fcn = ip_gateway_set, ));
+        NM_SETT_INFO_PROPERT_TYPE_DBUS(G_VARIANT_TYPE_STRING,
+                                       .to_dbus_fcn   = _nm_setting_property_to_dbus_fcn_get_string,
+                                       .from_dbus_fcn = ip_gateway_set),
+        .to_dbus_data.get_string =
+            (const char *(*) (NMSetting *) ) nm_setting_ip_config_get_gateway);
+
+    _nm_properties_override_gobj(
+        properties_override,
+        obj_properties[PROP_DHCP_HOSTNAME],
+        &nm_sett_info_propert_type_string,
+        .to_dbus_data.get_string =
+            (const char *(*) (NMSetting *) ) nm_setting_ip_config_get_dhcp_hostname);
+
+    _nm_properties_override_gobj(
+        properties_override,
+        obj_properties[PROP_DHCP_IAID],
+        &nm_sett_info_propert_type_string,
+        .to_dbus_data.get_string =
+            (const char *(*) (NMSetting *) ) nm_setting_ip_config_get_dhcp_iaid);
 
     /* ---dbus---
      * property: routing-rules
diff --git a/src/libnm-core-impl/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c
index e6cb00fea5..d87a59f4a8 100644
--- a/src/libnm-core-impl/nm-setting-ip-tunnel.c
+++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c
@@ -675,12 +675,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
      *
      * Since: 1.2
      **/
-    obj_properties[PROP_PARENT] = g_param_spec_string(
-        NM_SETTING_IP_TUNNEL_PARENT,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP_TUNNEL_PARENT,
+                                       PROP_PARENT,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip_tunnel_get_parent);
 
     /**
      * NMSettingIPTunnel:mode:
@@ -707,12 +707,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
      *
      * Since: 1.2
      **/
-    obj_properties[PROP_LOCAL] = g_param_spec_string(NM_SETTING_IP_TUNNEL_LOCAL,
-                                                     "",
-                                                     "",
-                                                     NULL,
-                                                     G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
-                                                         | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP_TUNNEL_LOCAL,
+                                       PROP_LOCAL,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip_tunnel_get_local);
 
     /**
      * NMSettingIPTunnel:remote:
@@ -722,12 +722,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
      *
      * Since: 1.2
      **/
-    obj_properties[PROP_REMOTE] = g_param_spec_string(
-        NM_SETTING_IP_TUNNEL_REMOTE,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP_TUNNEL_REMOTE,
+                                       PROP_REMOTE,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip_tunnel_get_remote);
 
     /**
      * NMSettingIPTunnel:ttl
@@ -786,12 +786,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
      *
      * Since: 1.2
      **/
-    obj_properties[PROP_INPUT_KEY] = g_param_spec_string(
-        NM_SETTING_IP_TUNNEL_INPUT_KEY,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP_TUNNEL_INPUT_KEY,
+                                       PROP_INPUT_KEY,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip_tunnel_get_input_key);
 
     /**
      * NMSettingIPTunnel:output-key:
@@ -801,12 +801,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass)
      *
      * Since: 1.2
      **/
-    obj_properties[PROP_OUTPUT_KEY] = g_param_spec_string(
-        NM_SETTING_IP_TUNNEL_OUTPUT_KEY,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP_TUNNEL_OUTPUT_KEY,
+                                       PROP_OUTPUT_KEY,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip_tunnel_get_output_key);
 
     /**
      * NMSettingIPTunnel:encapsulation-limit:
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c
index 336e59640d..15bae0cd40 100644
--- a/src/libnm-core-impl/nm-setting-ip4-config.c
+++ b/src/libnm-core-impl/nm-setting-ip4-config.c
@@ -847,12 +847,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44
      * ---end---
      */
-    obj_properties[PROP_DHCP_CLIENT_ID] =
-        g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID,
+                                       PROP_DHCP_CLIENT_ID,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_ip4_config_get_dhcp_client_id);
 
     /* ---ifcfg-rh---
      * property: dad-timeout
@@ -898,12 +898,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * example: DHCP_FQDN=foo.bar.com
      * ---end---
      */
-    obj_properties[PROP_DHCP_FQDN] =
-        g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_FQDN,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP4_CONFIG_DHCP_FQDN,
+                                       PROP_DHCP_FQDN,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_ip4_config_get_dhcp_fqdn);
 
     /**
      * NMSettingIP4Config:dhcp-vendor-class-identifier:
@@ -924,12 +924,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo
      * ---end---
      */
-    obj_properties[PROP_DHCP_VENDOR_CLASS_IDENTIFIER] =
-        g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
+                                       PROP_DHCP_VENDOR_CLASS_IDENTIFIER,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_ip4_config_get_dhcp_vendor_class_identifier);
 
     /* IP4-specific property overrides */
 
diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c
index 2bea668150..f6d59a46d1 100644
--- a/src/libnm-core-impl/nm-setting-ip6-config.c
+++ b/src/libnm-core-impl/nm-setting-ip6-config.c
@@ -914,12 +914,12 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
      * example: IPV6_TOKEN=::53
      * ---end---
      */
-    obj_properties[PROP_TOKEN] = g_param_spec_string(NM_SETTING_IP6_CONFIG_TOKEN,
-                                                     "",
-                                                     "",
-                                                     NULL,
-                                                     G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
-                                                         | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP6_CONFIG_TOKEN,
+                                       PROP_TOKEN,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_ip6_config_get_token);
 
     /**
      * NMSettingIP6Config:ra-timeout:
@@ -994,12 +994,12 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
      * example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01
      * ---end---
      */
-    obj_properties[PROP_DHCP_DUID] =
-        g_param_spec_string(NM_SETTING_IP6_CONFIG_DHCP_DUID,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_IP6_CONFIG_DHCP_DUID,
+                                       PROP_DHCP_DUID,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_ip6_config_get_dhcp_duid);
 
     /* IP6-specific property overrides */
 
diff --git a/src/libnm-core-impl/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c
index c325413b22..4acc5641e3 100644
--- a/src/libnm-core-impl/nm-setting-wired.c
+++ b/src/libnm-core-impl/nm-setting-wired.c
@@ -1291,11 +1291,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
      * description: The property is not saved by the plugin.
      * ---end---
      */
-    obj_properties[PROP_PORT] = g_param_spec_string(NM_SETTING_WIRED_PORT,
-                                                    "",
-                                                    "",
-                                                    NULL,
-                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_WIRED_PORT,
+                                       PROP_PORT,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_wired_get_port);
 
     /**
      * NMSettingWired:speed:
@@ -1352,11 +1353,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
      *    "duplex" parameter in the ETHOOL_OPTS variable.
      * ---end---
      */
-    obj_properties[PROP_DUPLEX] = g_param_spec_string(NM_SETTING_WIRED_DUPLEX,
-                                                      "",
-                                                      "",
-                                                      NULL,
-                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_WIRED_DUPLEX,
+                                       PROP_DUPLEX,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_wired_get_duplex);
 
     /**
      * NMSettingWired:auto-negotiate:
@@ -1529,12 +1531,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
      *   cloned-mac-address.
      * ---end---
      */
-    obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] = g_param_spec_string(
-        NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK,
+                                       PROP_GENERATE_MAC_ADDRESS_MASK,
+                                       NM_SETTING_PARAM_FUZZY_IGNORE,
+                                       nm_setting_wired_get_generate_mac_address_mask);
 
     /**
      * NMSettingWired:mac-address-blacklist:
@@ -1625,12 +1627,12 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
      * example: NETTYPE=qeth
      * ---end---
      */
-    obj_properties[PROP_S390_NETTYPE] = g_param_spec_string(
-        NM_SETTING_WIRED_S390_NETTYPE,
-        "",
-        "",
-        NULL,
-        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_WIRED_S390_NETTYPE,
+                                       PROP_S390_NETTYPE,
+                                       NM_SETTING_PARAM_INFERRABLE,
+                                       nm_setting_wired_get_s390_nettype);
 
     /**
      * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)):
@@ -1706,12 +1708,13 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass)
      * example: ETHTOOL_OPTS="wol gs sopass 00:11:22:33:44:55"
      * ---end---
      */
-    obj_properties[PROP_WAKE_ON_LAN_PASSWORD] =
-        g_param_spec_string(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD,
-                            "",
-                            "",
-                            NULL,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+    _nm_setting_property_define_string(properties_override,
+                                       obj_properties,
+                                       NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD,
+                                       PROP_WAKE_ON_LAN_PASSWORD,
+                                       NM_SETTING_PARAM_NONE,
+                                       nm_setting_wired_get_wake_on_lan_password);
+
     /**
      * NMSettingWired:accept-all-mac-addresses:
      *