diff options
27 files changed, 223 insertions, 230 deletions
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 55644e00b8..416d68672e 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -3042,7 +3042,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "this setting; refer to wpa_supplicant " "documentation for the allowed combinations.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:identity: @@ -3057,7 +3057,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "Identity string for EAP authentication methods. " "Often the user's user or login name.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:anonymous-identity: @@ -3075,7 +3075,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "types that support different tunneled identity like " "EAP-TTLS.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:pac-file: @@ -3088,7 +3088,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "PAC file", "UTF-8 encoded file path containing PAC for EAP-FAST.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:ca-cert: @@ -3116,7 +3116,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "supports CA certificates, but this allows " "man-in-the-middle attacks and is NOT recommended.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:ca-path: @@ -3134,7 +3134,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "verification chain in addition to the certificate " "specified in the 'ca-cert' property.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:subject-match: @@ -3154,7 +3154,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "authentication server certificate's subject is " "performed.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:altsubject-matches: @@ -3175,7 +3175,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "of the server certificate's " "altSubjectName is performed.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:client-cert: @@ -3200,7 +3200,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "certificate, prefixed with the string 'file://' " "and ending with a terminating NULL byte.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase1-peapver: @@ -3224,7 +3224,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "PEAP version. To do so, this property may be set to " "'0' or '1' to force that specific PEAP version.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase1-peaplabel: @@ -3244,7 +3244,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "Set to '1' to force use of the new PEAP label. See " "the wpa_supplicant documentation for more details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase1-fast-provisioning: @@ -3269,7 +3269,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "provisioning). See the wpa_supplicant documentation " "for more details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-auth: @@ -3294,7 +3294,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "specific parameters for successful authentication; " "see the wpa_supplicant documentation for more details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-autheap: @@ -3319,7 +3319,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "for successful authentication; see the wpa_supplicant " "documentation for more details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-ca-cert: @@ -3349,7 +3349,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "certificates, but this allows man-in-the-middle " "attacks and is NOT recommended.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-ca-path: @@ -3367,7 +3367,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "verification chain in addition to the certificate " "specified in the 'phase2-ca-cert' property.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-subject-match: @@ -3388,7 +3388,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "the authentication server certificate's subject " "is performed.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-altsubject-matches: @@ -3412,7 +3412,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "verification of the server certificate's " "altSubjectName is performed.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-client-cert: @@ -3439,7 +3439,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "certificate, prefixed with the string 'file://' " "and ending with a terminating NULL byte.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:password: @@ -3454,7 +3454,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "Password", "UTF-8 encoded password used for EAP authentication methods.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSetting8021x:password-flags: @@ -3468,7 +3468,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:password-raw: @@ -3489,7 +3489,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "'password-raw' are given, 'password' is " "preferred.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSetting8021x:password-raw-flags: @@ -3503,7 +3503,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:private-key: @@ -3546,7 +3546,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "the password used to decode the PKCS#12 private " "key and certificate.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:private-key-password: @@ -3567,7 +3567,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "private key either uses the path scheme, or if the " "private key is a PKCS#12 format key.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSetting8021x:private-key-password-flags: @@ -3582,7 +3582,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-private-key: @@ -3623,7 +3623,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "set to the password used to decode the PKCS#12 " "private key and certificate.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:phase2-private-key-password: @@ -3644,7 +3644,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "phase2 private key either uses the path scheme, or " "if the phase2 private key is a PKCS#12 format key.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSetting8021x:phase2-private-key-password-flags: @@ -3659,7 +3659,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:pin: @@ -3672,7 +3672,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "PIN", "PIN used for EAP authentication methods.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSetting8021x:pin-flags: @@ -3686,7 +3686,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSetting8021x:system-ca-certs: @@ -3710,7 +3710,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) "chain in addition to any certificates specified " "by the 'ca-cert' and 'phase2-ca-cert' properties.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /* Initialize crypto lbrary. */ if (!nm_utils_init (&error)) { diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index 981b5cfe5b..8095b52d74 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -392,7 +392,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "Username", "Username used to authenticate with the pppoa service.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingAdsl:password: @@ -405,7 +405,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "Password", "Password used to authenticate with the pppoa service.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingAdsl:password-flags: @@ -419,7 +419,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingAdsl:protocol: @@ -432,7 +432,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "Protocol", "ADSL connection protocol.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingAdsl:encapsulation: @@ -445,7 +445,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "Encapsulation", "Encapsulation of ADSL connection", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingAdsl:vpi: @@ -458,7 +458,7 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "VPI", "VPI of ADSL connection", 0, 65536, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingAdsl:vci: @@ -471,5 +471,5 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) "VCI", "VCI of ADSL connection", 0, 65536, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index f63a3769a2..d03c04cc80 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -284,7 +284,7 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class) "Bluetooth address", "The Bluetooth address of the device", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingBluetooth:type: @@ -301,5 +301,5 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class) "'" NM_SETTING_BLUETOOTH_TYPE_PANU "' for " "Personal Area Networking connections.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index a96b5dacde..3459300ec9 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -802,7 +802,7 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) "InterfaceName", "The name of the virtual in-kernel bonding network interface", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingBond:options: @@ -820,5 +820,5 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) "strings. Option names must contain only " "alphanumeric characters (ie, [a-zA-Z0-9]).", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index 67c91a9cdb..07d5dbd6bd 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -269,7 +269,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) "Priority", "The Spanning Tree Protocol (STP) priority of this bridge port", 0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridgePort:path-cost: @@ -285,7 +285,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) "The Spanning Tree Protocol (STP) port cost for " "destinations via this port.", 0, BR_MAX_PATH_COST, 100, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridgePort:hairpin-mode: @@ -303,6 +303,6 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) "port, which allows frames to be sent back out " "through the port the frame was received on.", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 64d3fc81c6..f5131e50a3 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -434,7 +434,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "InterfaceName", "The name of the virtual in-kernel bridging network interface", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingBridge:stp: @@ -450,7 +450,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "Controls whether Spanning Tree Protocol (STP) " "is enabled for this bridge.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridge:priority: @@ -470,7 +470,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "lowest priority bridge will be elected the root " "bridge.", 0, G_MAXUINT16, 0x80, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridge:forward-delay: @@ -486,7 +486,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "The Spanning Tree Protocol (STP) forwarding " "delay, in seconds.", 0, BR_MAX_FORWARD_DELAY, 15, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridge:hello-time: @@ -502,7 +502,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "The Spanning Tree Protocol (STP) hello time, in " "seconds.", 0, BR_MAX_HELLO_TIME, 2, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridge:max-age: @@ -518,7 +518,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "The Spanning Tree Protocol (STP) maximum message " "age, in seconds.", 0, BR_MAX_MAX_AGE, 20, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingBridge:ageing-time: @@ -533,6 +533,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) "AgeingTime", "The ethernet MAC address aging time, in seconds.", 0, BR_MAX_AGEING_TIME, 300, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 8560e82b65..4ab0e167b7 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -316,7 +316,7 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class) "specified, the default number (#777) is used when " "required.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingCdma:username: @@ -333,7 +333,7 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class) "required. Note that many providers do not require " "a username or accept any username.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingCdma:password: @@ -350,7 +350,7 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class) "required. Note that many providers do not require " "a password or accept any password.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingCdma:password-flags: @@ -364,5 +364,5 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 7ff4455962..19c57d1ae2 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -1032,7 +1032,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "one or more characters and may change over the lifetime " "of the connection if the user decides to rename it.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:uuid: @@ -1065,7 +1065,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "WiFi SSID, mobile broadband network provider, or the " "connection type changes.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:interface-name: @@ -1099,7 +1099,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "reordered the connection may be applied to the wrong " "interface.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingConnection:type: @@ -1121,7 +1121,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "otherwise, should contain the setting name of that " "setting type (ie, 'vpn' or 'bridge', etc).", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingConnection:permissions: @@ -1160,7 +1160,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "use. All of [type], [id], and [reserved] must be " "valid UTF-8.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingConnection:autoconnect: @@ -1179,7 +1179,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "the connection must be manually activated by the user " "or some other mechanism.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:timestamp: @@ -1198,7 +1198,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "has the latest timestamp. The property is only meant for " "reading (changes to this property will not be preserved).", 0, G_MAXUINT64, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:read-only: @@ -1216,7 +1216,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "normally set for system connections whose plugin " "cannot yet write updated connections back out.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:zone: @@ -1237,7 +1237,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "placed in the default zone as defined by the " "firewall.", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:master: @@ -1251,7 +1251,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "Interface name of the master device or UUID of " "the master connection", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:slave-type: @@ -1267,7 +1267,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "this connection is (ie, 'bond') or NULL if this " "connection is not a slave.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:secondaries: @@ -1284,7 +1284,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "List of connection UUIDs that should be activated " "when the base connection itself is activated.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingConnection:gateway-ping-timeout: @@ -1302,5 +1302,5 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) "addressing until either the timeout is reached, or " "an IP gateway replies to a ping.", 0, 30, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index cf2d47d120..7414972c62 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -974,7 +974,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Flags may be any combination of 0x1 (enable), 0x2 " "(advertise), and 0x4 (willing).", 0, DCB_FLAGS_ALL, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:app-fcoe-priority: @@ -994,7 +994,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "used when the 'app-fcoe-flags' property includes " "the 'enabled' flag.", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingDcb:app-fcoe-mode: @@ -1011,7 +1011,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "The FCoe controller mode; either 'fabric' (default) " "or 'vn2vn'.", NM_SETTING_DCB_FCOE_MODE_FABRIC, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingDcb:app-iscsi-flags: @@ -1028,7 +1028,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Flags may be any combination of 0x1 (enable), 0x2 " "(advertise), and 0x4 (willing).", 0, DCB_FLAGS_ALL, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:app-iscsi-priority: @@ -1047,7 +1047,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "used when the 'app-iscsi-flags' property includes " "the 'enabled' flag.", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingDcb:app-fip-flags: @@ -1064,7 +1064,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Flags may be any combination of 0x1 (enable), 0x2 " "(advertise), and 0x4 (willing).", 0, DCB_FLAGS_ALL, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:app-fip-priority: @@ -1083,7 +1083,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "used when the 'app-fip-flags' property includes " "the 'enabled' flag.", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingDcb:priority-flow-control-flags: @@ -1100,7 +1100,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Flags may be any combination of 0x1 (enable), 0x2 " "(advertise), and 0x4 (willing).", 0, DCB_FLAGS_ALL, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-flow-control: @@ -1123,7 +1123,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "values are 0 (do not transmit pause) and 1 " "(transmit pause).", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-group-flags: @@ -1140,7 +1140,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Flags may be any combination of 0x1 (enable), 0x2 " "(advertise), and 0x4 (willing).", 0, DCB_FLAGS_ALL, 0, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-group-id: @@ -1162,7 +1162,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "Allowed Priority Group ID values are 0 - 7 or " "15 for the unrestricted group.", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-group-bandwidth: @@ -1184,7 +1184,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "allocated to that group. Allowed values are 0 - 100, " "and the sum of all values must total 100 percent.", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-bandwidth: @@ -1208,7 +1208,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "use. The sum of all percentages for priorities which " "belong to the same group must total 100 percent.", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-strict: @@ -1233,7 +1233,7 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "utilize all bandwidth) or 1 (the priority may " "utilize all bandwidth).", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingDcb:priority-traffic-class: @@ -1253,6 +1253,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) "value indicates the traffic class (0 - 7) to which " "the priority is mapped.", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index 3a31932755..4e0198198b 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -564,7 +564,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "blank, which allows NetworkManager to select the " "appropriate settings automatically.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:username: @@ -581,7 +581,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "required. Note that many providers do not require " "a username or accept any username.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:password: @@ -598,7 +598,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "required. Note that many providers do not require " "a password or accept any password.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingGsm:password-flags: @@ -612,7 +612,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:apn: @@ -639,7 +639,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "plan. The APN may only be composed of the characters " "a-z, 0-9, ., and - per GSM 03.60 Section 14.9.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:network-id: @@ -662,7 +662,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "roam when direct roaming control of the device is " "not otherwise possible.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:network-type: @@ -688,7 +688,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_GSM_NETWORK_TYPE_ANY, NM_SETTING_GSM_NETWORK_TYPE_4G, NM_SETTING_GSM_NETWORK_TYPE_ANY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingGsm:allowed-bands: @@ -710,7 +710,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_GSM_BAND_UNKNOWN, NM_SETTING_GSM_BANDS_MAX, NM_SETTING_GSM_BAND_ANY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingGsm:pin: @@ -727,7 +727,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "before any other operations are requested. Specify " "the PIN here to allow operation of the device.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingGsm:pin-flags: @@ -741,7 +741,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingGsm:home-only: @@ -757,5 +757,5 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) "be allowed. Connections to roaming networks will " "not be made.", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index f8b56140bb..9739afeadf 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -367,7 +367,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) "This property does not change the MAC address " "of the device (i.e. MAC spoofing).", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingInfiniband:mtu: @@ -383,7 +383,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) "size or smaller, breaking larger packets up into " "multiple frames.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingInfiniband:transport-mode: @@ -397,7 +397,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) "Transport Mode", "The IPoIB transport mode. Either 'datagram' or 'connected'.", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingInfiniband:p-key: @@ -414,7 +414,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) "The InfiniBand P_Key. Either -1 for the " "default, or a 16-bit unsigned integer.", -1, 0xFFFF, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingInfiniband:parent: @@ -430,6 +430,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) "Parent", "The interface name of the parent device, or NULL", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 6a7d7655f8..83d72d6c5f 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1027,7 +1027,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "connection. 'disabled' means IPv4 will not be " "used on this connection. This property must be set.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:dns: @@ -1052,7 +1052,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "other methods, these DNS servers are used as the " "only DNS servers for this connection.", DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:dns-search: @@ -1076,7 +1076,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "search domains are used as the only search domains " "for this connection.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:addresses: @@ -1107,7 +1107,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "'disabled' methods as addressing is either " "automatic or disabled with these methods.", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:routes: @@ -1138,7 +1138,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "'shared', 'link-local', or 'disabled', methods " "as there is no upstream network.", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:ignore-auto-routes: @@ -1156,7 +1156,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "ignored and only routes specified in the 'routes' " "property, if any, are used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP4Config:ignore-auto-dns: @@ -1176,7 +1176,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "search domains specified in the 'dns' and 'dns-search' " "properties, if any, are used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP4Config:dhcp-client-id: @@ -1192,7 +1192,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "local machine which the DHCP server may use to " "customize the DHCP lease and options.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:dhcp-send-hostname: @@ -1215,7 +1215,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "property is TRUE, the current persistent hostname " "of the computer is sent.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP4Config:dhcp-hostname: @@ -1231,7 +1231,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "the specified name will be sent to the DHCP server " "when acquiring a lease.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP4Config:never-default: @@ -1247,7 +1247,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "IPv4 connection, meaning it will never be assigned " "the default route by NetworkManager.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP4Config:may-fail: @@ -1272,7 +1272,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) "configuration to succeed if IPv4 configuration " "fails but IPv6 configuration completes successfully.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 21c1cd2b74..1ed89f7939 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -924,7 +924,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "property must be set. Note: the 'shared' method " "is not yet supported.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:dhcp-hostname: @@ -940,7 +940,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "The specified name will be sent to the DHCP server " "when acquiring a lease.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:dns: @@ -968,7 +968,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "these DNS servers are used as the only DNS " "servers for this connection.", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:dns-search: @@ -992,7 +992,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "domains are used as the only search domains for " "this connection.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:addresses: @@ -1028,7 +1028,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "as the interface is automatically assigned an " "address with these methods.", DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:routes: @@ -1059,7 +1059,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "used with the 'shared' or 'link-local' methods " "because there is no upstream network.", DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingIP6Config:ignore-auto-routes: @@ -1077,7 +1077,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "routes are ignored and only routes specified in the " "'routes' property, if any, are used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP6Config:ignore-auto-dns: @@ -1098,7 +1098,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "nameservers and search domains specified in the 'dns' " "and 'dns-search' properties, if any, are used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP6Config:never-default: @@ -1114,7 +1114,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "IPv6 connection, meaning it will never be assigned " "the default IPv6 route by NetworkManager.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP6Config:may-fail: @@ -1139,7 +1139,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) "configuration to succeed if IPv6 configuration " "fails but IPv4 configuration completes successfully.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingIP6Config:ip6-privacy: @@ -1167,8 +1167,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); - + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } /********************************************************************/ diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index 3fef364e63..834aa29028 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -248,7 +248,7 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) "SSID", "SSID of the mesh network to join.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingOlpcMesh:channel: @@ -261,7 +261,7 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) "Channel", "Channel on which the mesh network to join is located.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingOlpcMesh:dhcp-anycast-address: @@ -280,6 +280,5 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) "which DHCP server class answers the " "the request.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); - + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 892a32051f..b924871ee6 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -580,7 +580,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "If FALSE, require authentication from the remote " "side. In almost all cases, this should be TRUE.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:refuse-eap: @@ -593,7 +593,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse EAP", "If TRUE, the EAP authentication method will not be used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:refuse-pap: @@ -606,7 +606,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse PAP", "If TRUE, the PAP authentication method will not be used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:refuse-chap: @@ -619,7 +619,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse CHAP", "If TRUE, the CHAP authentication method will not be used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:refuse-mschap: @@ -632,7 +632,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse MSCHAP", "If TRUE, the MSCHAP authentication method will not be used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:refuse-mschapv2: @@ -645,7 +645,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "Refuse MSCHAPv2", "If TRUE, the MSCHAPv2 authentication method will not be used.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:nobsdcomp: @@ -658,7 +658,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No BSD compression", "If TRUE, BSD compression will not be requested.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:nodeflate: @@ -671,7 +671,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No deflate", "If TRUE, 'deflate' compression will not be requested.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:no-vj-comp: @@ -684,7 +684,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "No VJ compression", "If TRUE, Van Jacobsen TCP header compression will not be requested.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:require-mppe: @@ -704,7 +704,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "will fail. Note that MPPE is not used on mobile " "broadband connections.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:require-mppe-128: @@ -723,7 +723,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "must also be set to TRUE. If 128-bit MPPE is not " "available the session will fail.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT| NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:mppe-stateful: @@ -738,7 +738,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "If TRUE, stateful MPPE is used. See pppd documentation " "for more information on stateful MPPE.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:crtscts: @@ -756,7 +756,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "signals. This value should normally be set to " "FALSE.", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:baud: @@ -773,7 +773,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "the specified baudrate. This value should normally be " "left as 0 to automatically choose the speed.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:mru: @@ -790,7 +790,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "send packets no larger than the specified size. If " "non-zero, the MRU should be between 128 and 16384.", 0, 16384, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingPPP:mtu: @@ -805,7 +805,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "If non-zero, instruct pppd to send packets no larger " "than the specified size.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:lcp-echo-failure: @@ -826,7 +826,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "also be set to a non-zero value if this property is " "used.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingPPP:lcp-echo-interval: @@ -846,5 +846,5 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) "to echo requests and some will not, and it is not " "possible to autodetect this.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); } diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index af718ffa61..2e33f711da 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -309,7 +309,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class) "access concentrators or a specific service is known " "to be required.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingPPPOE:username: @@ -322,7 +322,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class) "Username", "Username used to authenticate with the PPPoE service.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingPPPOE:password: @@ -335,7 +335,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class) "Password", "Password used to authenticate with the PPPoE service.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingPPPOE:password-flags: @@ -349,5 +349,5 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class) NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index 203f57480b..83c38c5429 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -269,7 +269,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) "broadband modems as they generally ignore speed " "settings and use the highest available speed.", 0, G_MAXUINT, 57600, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingSerial:bits: @@ -283,7 +283,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) "Byte-width of the serial communication. The 8 in " "'8n1' for example.", 5, 8, 8, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingSerial:parity: @@ -298,7 +298,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) "Parity setting of the serial port. Either 'E' for even " "parity, 'o' for odd parity, or 'n' for no parity.", 'E', 'o', 'n', - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingSerial:stopbits: @@ -313,7 +313,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) "Number of stop bits for communication on the serial " "port. Either 1 or 2. The 1 in '8n1' for example.", 1, 2, 1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingSerial:send-delay: @@ -327,5 +327,5 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) "Time to delay between each byte sent to the modem, " "in microseconds.", 0, G_MAXUINT64, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index b85e8aa7e2..e70c24714a 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -179,5 +179,5 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *setting_class) "teamd. If not specified, the dafault configuration is used. " "See man teamd.conf for the format details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index d3547edd84..35d4ef719e 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -238,7 +238,7 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) "InterfaceName", "The name of the virtual in-kernel team network interface", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingTeam:config: @@ -259,5 +259,5 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) "teamd. If not specified, the default configuration is used. " "See man teamd.conf for the format details.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 2840a1e5da..32f8e35c94 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -696,7 +696,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "the 'parent' property or by the 'mac-address' " "property of a 'wired' setting.", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingVlan:parent: @@ -716,7 +716,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "not specified, the connection must contain a " "'wired' setting with a 'mac-address' property.", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingVlan:id: @@ -731,7 +731,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "The VLAN indentifier the interface created by " "this connection should be assigned.", 0, 4095, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingVlan:flags: @@ -750,7 +750,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "of the interface to its master device's operating " "state (0x04).", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingVlan:ingress-priority-map: @@ -769,7 +769,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "format 'from:to' where both 'from' and " "'to' are unsigned integers, ie '7:3'.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingVlan:egress-priority-map: @@ -788,5 +788,5 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "format 'from:to' where both 'from' and " "'to' are unsigned integers, ie '7:3'.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 7af84cc912..0423b77bbd 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -820,7 +820,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) "org.freedesktop.NetworkManager.vpnc for the vpnc " "plugin.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingVPN:user-name: @@ -845,7 +845,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) "automatically supply the username of the user which " "requested the VPN connection.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingVPN:data: @@ -861,7 +861,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) "specific data. Both keys and values must be " "strings.", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingVPN:secrets: @@ -877,6 +877,6 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) "specific secrets like passwords or private keys." " Both keys and values must be strings.", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); } diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 397cf28bc4..22942cf887 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -247,7 +247,7 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class) "Network Service Provider (NSP) name of the WiMAX " "network this connection should use.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWimax:mac-address: @@ -265,5 +265,5 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class) "This property does not change the MAC address " "of the device (known as MAC spoofing).", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 7c2a0d4781..d04e70fbe1 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -831,7 +831,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "Interface. If the device supports only one port " "type, this setting is ignored.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWired:speed: @@ -846,7 +846,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "If non-zero, request that the device use only the " "specified speed. In Mbit/s, ie 100 == 100Mbit/s.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingWired:duplex: @@ -861,7 +861,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "If specified, request that the device only use the " "specified duplex mode. Either 'half' or 'full'.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingEthernet:auto-negotiate: @@ -879,7 +879,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "in which case the 'speed' and 'duplex' properties " "should be set.", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingWired:mac-address: @@ -897,7 +897,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "This property does not change the MAC address " "of the device (i.e. MAC spoofing).", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWired:cloned-mac-address: @@ -913,7 +913,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "this MAC address instead of its permanent MAC address. " "This is known as MAC cloning or spoofing.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWired:mac-address-blacklist: @@ -932,7 +932,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "an address in the list. Each MAC address is in the " "standard hex-digits-and-colons notation (00:11:22:33:44:55).", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWired:mtu: @@ -948,7 +948,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "size or smaller, breaking larger packets up into " "multiple Ethernet frames.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWired:s390-subchannels: @@ -974,7 +974,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "string may only be composed of hexadecimal " "characters and the period (.) character.", DBUS_TYPE_G_ARRAY_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWired:s390-nettype: @@ -990,7 +990,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "'ctc', representing the different types of virtual " "network devices available on s390 systems.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWired:s390-options: @@ -1009,6 +1009,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) "strings. Allowed keys include 'portno', " "'layer2', 'portname', 'protocol', among others.", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 2c6984b464..705476c9ce 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -1265,7 +1265,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "or 'wpa-eap' (WPA-Enterprise). This property must " "be set for any WiFi connection that uses security.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_REQUIRED)); + G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED)); /** * NMSettingWirelessSecurity:wep-tx-keyidx: @@ -1285,7 +1285,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "through 3. Note that some consumer access points " "(like the Linksys WRT54G) number the keys 1 - 4.", 0, 3, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingWirelessSecurity:auth-alg: @@ -1308,7 +1308,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "'ieee8021x' and auth-alg = 'leap') the 'leap-username' " "and 'leap-password' properties must be specified.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:proto: @@ -1327,7 +1327,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "WPA2/RSN). If not specified, both WPA and RSN " "connections are allowed.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:pairwise: @@ -1348,7 +1348,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "empty. Each list element may be one of 'tkip' " "or 'ccmp'.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:group: @@ -1369,7 +1369,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "property empty. Each list element may be one " " of 'wep40', 'wep104', 'tkip', or 'ccmp'.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:leap-username: @@ -1384,7 +1384,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "The login username for legacy LEAP connections " "(ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:wep-key0: @@ -1400,7 +1400,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "networks. See the 'wep-key-type' property for a " "description of how this key is interpreted.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:wep-key1: @@ -1416,7 +1416,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "networks. See the 'wep-key-type' property for a " "description of how this key is interpreted.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:wep-key2: @@ -1432,7 +1432,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "networks. See the 'wep-key-type' property for a " "description of how this key is interpreted.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:wep-key3: @@ -1448,7 +1448,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "networks. See the 'wep-key-type' property for a " "description of how this key is interpreted.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:wep-key-flags: @@ -1462,7 +1462,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:psk: @@ -1487,7 +1487,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "to derive the actual WPA-PSK used when connecting to " "the WiFi network.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:psk-flags: @@ -1501,7 +1501,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:leap-password: @@ -1516,7 +1516,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting "The login password for legacy LEAP connections " "(ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); + G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); /** * NMSettingWirelessSecurity:leap-password-flags: @@ -1530,7 +1530,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAG_NONE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWirelessSecurity:wep-key-type: @@ -1557,5 +1557,5 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting NM_WEP_KEY_TYPE_UNKNOWN, NM_WEP_KEY_TYPE_LAST, NM_WEP_KEY_TYPE_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); } diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index baab945776..cc4e574141 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -986,7 +986,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "SSID", "SSID of the WiFi network. Must be specified.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:mode: @@ -1001,7 +1001,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "WiFi network mode; one of 'infrastructure', " "'adhoc' or 'ap'. If blank, infrastructure is assumed.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:band: @@ -1026,7 +1026,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "compatible. This setting depends on specific driver " "capability and may not work with all drivers.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:channel: @@ -1046,7 +1046,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "channel numbers overlap between bands, this property " "also requires the 'band' property to be set.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** * NMSettingWireless:bssid: @@ -1067,7 +1067,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "the BSSID used when creating an Ad-Hoc network " "and is unlikely to in the future.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:rate: @@ -1087,7 +1087,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "property is highly driver dependent and not all devices " "support setting a static bitrate.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWireless:tx-power: @@ -1105,7 +1105,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "driver dependent and not all devices support setting a " "static transmit power.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWireless:mac-address: @@ -1123,7 +1123,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "This property does not change the MAC address " "of the device (i.e. MAC spoofing).", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:cloned-mac-address: @@ -1139,7 +1139,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "this MAC address instead of its permanent MAC address. " "This is known as MAC cloning or spoofing.", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:mac-address-blacklist: @@ -1158,7 +1158,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "given in the standard hex-digits-and-colons " "notation (eg '00:11:22:33:44:55').", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWireless:seen-bssids: @@ -1182,7 +1182,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "The changes you make to this property will not be " "preserved.", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWireless:mtu: @@ -1198,7 +1198,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "size or smaller, breaking larger packets up into " "multiple Ethernet frames.", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); /** * NMSettingWireless:security: @@ -1220,7 +1220,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "and ensure the connection contains a valid " NM_SETTING_WIRELESS_SECURITY_SETTING_NAME " setting.", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); /** * NMSettingWireless:hidden: @@ -1243,5 +1243,5 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) "insecurities with hidden SSID networks, and thus " "hidden SSID networks should be used with caution.", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + G_PARAM_READWRITE)); } diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index b3db363b77..ceabc56451 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -277,7 +277,8 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags) GParamSpec *prop_spec = property_specs[i]; GValue *value; - if (!(prop_spec->flags & NM_SETTING_PARAM_SERIALIZE)) + /* 'name' doesn't get serialized */ + if (strcmp (g_param_spec_get_name (prop_spec), NM_SETTING_NAME) == 0) continue; if ( (flags & NM_SETTING_HASH_FLAG_NO_SECRETS) @@ -352,7 +353,7 @@ nm_setting_new_from_hash (GType setting_type, GHashTable *hash) GParamSpec *param_spec; param_spec = g_object_class_find_property (class, prop_name); - if (!param_spec || !(param_spec->flags & NM_SETTING_PARAM_SERIALIZE)) { + if (!param_spec) { /* Oh, we're so nice and only warn, maybe it should be a fatal error? */ g_warning ("Ignoring invalid property '%s'", prop_name); continue; @@ -1102,9 +1103,11 @@ nm_setting_to_string (NMSetting *setting) GParamSpec *prop_spec = property_specs[i]; GValue value = G_VALUE_INIT; char *value_str; - gboolean is_serializable; gboolean is_default; + if (strcmp (prop_spec->name, NM_SETTING_NAME) == 0) + continue; + g_value_init (&value, prop_spec->value_type); g_object_get_property (G_OBJECT (setting), prop_spec->name, &value); @@ -1112,22 +1115,14 @@ nm_setting_to_string (NMSetting *setting) g_string_append_printf (string, "\t%s : %s", prop_spec->name, value_str); g_free (value_str); - is_serializable = prop_spec->flags & NM_SETTING_PARAM_SERIALIZE; is_default = g_param_value_defaults (prop_spec, &value); - g_value_unset (&value); - if (is_serializable || is_default) { - g_string_append (string, " ("); - - if (is_serializable) - g_string_append_c (string, 's'); - if (is_default) - g_string_append_c (string, 'd'); - - g_string_append_c (string, ')'); - } - + g_string_append (string, " ("); + g_string_append_c (string, 's'); + if (is_default) + g_string_append_c (string, 'd'); + g_string_append_c (string, ')'); g_string_append_c (string, '\n'); } diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index b4ea987edf..ca8334f6f8 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -64,7 +64,7 @@ typedef enum GQuark nm_setting_error_quark (void); -/* The property of the #NMSetting should be serialized */ +/* DEPRECATED AND UNUSED */ #define NM_SETTING_PARAM_SERIALIZE (1 << (0 + G_PARAM_USER_SHIFT)) /* The property of the #NMSetting is required for the setting to be valid */ |