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

libnm-util: remove NMSetting* GParamSpec docs

Browse Source 
Remove all the GParamSpec docs, since everything now uses the gtk-doc
docs instead, so there's no point in having two copies of each (which
are often out of sync anyway).

Since we're touching so many lines anyway, also fix up the indentation
of the remaining property-installing lines, and add
G_PARAM_STATIC_STRINGS to each paramspec (so the nick strings don't
get strduped). Also, be consistent about starting a new line between
"g_object_class_install_property" and its opening parenthesis.
This commit is contained in:
Dan Winship
2014-06-05 16:23:32 -04:00
parent 8252ebd941
commit cdc15cb2a6
26 changed files with 840 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

420
libnm-util/nm-setting-8021x.c
View File

@@ -3143,17 +3143,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_EAP, (object_class, PROP_EAP,
_nm_param_spec_specialized (NM_SETTING_802_1X_EAP, _nm_param_spec_specialized (NM_SETTING_802_1X_EAP, "", "",
"EAP",
"The allowed EAP method to be used when "
"authenticating to the network with 802.1x. "
"Valid methods are: 'leap', 'md5', 'tls', 'peap', "
"'ttls', 'pwd', and 'fast'. Each method requires "
"different configuration using the properties of "
"this setting; refer to wpa_supplicant "
"documentation for the allowed combinations.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:identity: * NMSetting8021x:identity:
@@ -3163,12 +3156,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IDENTITY, (object_class, PROP_IDENTITY,
g_param_spec_string (NM_SETTING_802_1X_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_IDENTITY, "", "",
"Identity",
"Identity string for EAP authentication methods. "
"Often the user's user or login name.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:anonymous-identity: * NMSetting8021x:anonymous-identity:
@@ -3179,14 +3170,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ANONYMOUS_IDENTITY, (object_class, PROP_ANONYMOUS_IDENTITY,
g_param_spec_string (NM_SETTING_802_1X_ANONYMOUS_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_ANONYMOUS_IDENTITY, "", "",
"Anonymous identity",
"Anonymous identity string for EAP authentication "
"methods. Used as the unencrypted identity with EAP "
"types that support different tunneled identity like "
"EAP-TTLS.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:pac-file: * NMSetting8021x:pac-file:
@@ -3195,11 +3182,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PAC_FILE, (object_class, PROP_PAC_FILE,
g_param_spec_string (NM_SETTING_802_1X_PAC_FILE, g_param_spec_string (NM_SETTING_802_1X_PAC_FILE, "", "",
"PAC file",
"UTF-8 encoded file path containing PAC for EAP-FAST.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:ca-cert: * NMSetting8021x:ca-cert:
@@ -3221,24 +3207,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CA_CERT, (object_class, PROP_CA_CERT,
_nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT, "", "",
"CA certificate",
"Contains the CA certificate if used by the EAP "
"method specified in the 'eap' property. "
"Certificate data is specified using a 'scheme'; "
"two are currently supported: blob and path. "
"When using the blob scheme (which is backwards "
"compatible with NM 0.7.x) this property should "
"be set to the certificate's DER encoded data. "
"When using the path scheme, this property should "
"be set to the full UTF-8 encoded path of the "
"certificate, prefixed with the string 'file://' "
"and ending with a terminating NULL byte. This "
"property can be unset even if the EAP method "
"supports CA certificates, but this allows "
"man-in-the-middle attacks and is NOT recommended.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:ca-path: * NMSetting8021x:ca-path:
@@ -3249,14 +3221,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CA_PATH, (object_class, PROP_CA_PATH,
g_param_spec_string (NM_SETTING_802_1X_CA_PATH, g_param_spec_string (NM_SETTING_802_1X_CA_PATH, "", "",
"CA path",
"UTF-8 encoded path to a directory containing PEM or "
"DER formatted certificates to be added to the "
"verification chain in addition to the certificate "
"specified in the 'ca-cert' property.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:subject-match: * NMSetting8021x:subject-match:
@@ -3267,15 +3235,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SUBJECT_MATCH, (object_class, PROP_SUBJECT_MATCH,
g_param_spec_string (NM_SETTING_802_1X_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_SUBJECT_MATCH, "", "",
"Subject match",
"Substring to be matched against the subject of "
"the certificate presented by the authentication "
"server. When unset, no verification of the "
"authentication server certificate's subject is "
"performed.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:altsubject-matches: * NMSetting8021x:altsubject-matches:
@@ -3286,16 +3249,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ALTSUBJECT_MATCHES, (object_class, PROP_ALTSUBJECT_MATCHES,
_nm_param_spec_specialized (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, _nm_param_spec_specialized (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, "", "",
"altSubjectName matches",
"List of strings to be matched against "
"the altSubjectName of the certificate "
"presented by the authentication server. "
"If the list is empty, no verification "
"of the server certificate's "
"altSubjectName is performed.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:client-cert: * NMSetting8021x:client-cert:
@@ -3315,21 +3272,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CLIENT_CERT, (object_class, PROP_CLIENT_CERT,
_nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT, "", "",
"Client certificate",
"Contains the client certificate if used by the "
"EAP method specified in the 'eap' property. "
"Certificate data is specified using a 'scheme'; "
"two are currently supported: blob and path. "
"When using the blob scheme (which is backwards "
"compatible with NM 0.7.x) this property should "
"be set to the certificate's DER encoded data. "
"When using the path scheme, this property should "
"be set to the full UTF-8 encoded path of the "
"certificate, prefixed with the string 'file://' "
"and ending with a terminating NULL byte.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase1-peapver: * NMSetting8021x:phase1-peapver:
@@ -3343,17 +3289,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE1_PEAPVER, (object_class, PROP_PHASE1_PEAPVER,
g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPVER, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPVER, "", "",
"Phase1 PEAPVER",
"Forces which PEAP version is used when PEAP is set "
"as the EAP method in 'eap' property. When unset, "
"the version reported by the server will be used. "
"Sometimes when using older RADIUS servers, it is "
"necessary to force the client to use a particular "
"PEAP version. To do so, this property may be set to "
"'0' or '1' to force that specific PEAP version.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase1-peaplabel: * NMSetting8021x:phase1-peaplabel:
@@ -3365,15 +3304,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE1_PEAPLABEL, (object_class, PROP_PHASE1_PEAPLABEL,
g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPLABEL, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPLABEL, "", "",
"Phase1 PEAP label",
"Forces use of the new PEAP label during key "
"derivation. Some RADIUS servers may require forcing "
"the new PEAP label to interoperate with PEAPv1. "
"Set to '1' to force use of the new PEAP label. See "
"the wpa_supplicant documentation for more details.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase1-fast-provisioning: * NMSetting8021x:phase1-fast-provisioning:
@@ -3387,18 +3321,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE1_FAST_PROVISIONING, (object_class, PROP_PHASE1_FAST_PROVISIONING,
g_param_spec_string (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, g_param_spec_string (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, "", "",
"Phase1 fast provisioning",
"Enables or disables in-line provisioning of EAP-FAST "
"credentials when FAST is specified as the EAP method "
"in the #NMSetting8021x:eap property. Allowed values "
"are '0' (disabled), '1' (allow unauthenticated "
"provisioning), '2' (allow authenticated provisioning), "
"and '3' (allow both authenticated and unauthenticated "
"provisioning). See the wpa_supplicant documentation "
"for more details.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-auth: * NMSetting8021x:phase2-auth:
@@ -3412,18 +3338,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_AUTH, (object_class, PROP_PHASE2_AUTH,
g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTH, "", "",
"Phase2 auth",
"Specifies the allowed 'phase 2' inner non-EAP "
"authentication methods when an EAP method that uses "
"an inner TLS tunnel is specified in the 'eap' "
"property. Recognized non-EAP phase2 methods are 'pap', "
"'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', "
"and 'tls'. Each 'phase 2' inner method requires "
"specific parameters for successful authentication; "
"see the wpa_supplicant documentation for more details.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-autheap: * NMSetting8021x:phase2-autheap:
@@ -3437,18 +3355,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_AUTHEAP, (object_class, PROP_PHASE2_AUTHEAP,
g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTHEAP, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTHEAP, "", "",
"Phase2 autheap",
"Specifies the allowed 'phase 2' inner EAP-based "
"authentication methods when an EAP method that uses "
"an inner TLS tunnel is specified in the 'eap' "
"property. Recognized EAP-based 'phase 2' methods are "
"'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each "
"'phase 2' inner method requires specific parameters "
"for successful authentication; see the wpa_supplicant "
"documentation for more details.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-ca-cert: * NMSetting8021x:phase2-ca-cert:
@@ -3471,25 +3381,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_CA_CERT, (object_class, PROP_PHASE2_CA_CERT,
_nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT, "", "",
"Phase2 CA certificate",
"Contains the 'phase 2' CA certificate if used by "
"the EAP method specified in the 'phase2-auth' or "
"'phase2-autheap' properties. Certificate data "
"is specified using a 'scheme'; two are currently"
"supported: blob and path. When using the blob "
"scheme (which is backwards compatible with NM "
"0.7.x) this property should be set to the "
"certificate's DER encoded data. When using the "
"path scheme, this property should be set to the "
"full UTF-8 encoded path of the certificate, "
"prefixed with the string 'file://' and ending "
"with a terminating NULL byte. This property can "
"be unset even if the EAP method supports CA "
"certificates, but this allows man-in-the-middle "
"attacks and is NOT recommended.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-ca-path: * NMSetting8021x:phase2-ca-path:
@@ -3500,14 +3395,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_CA_PATH, (object_class, PROP_PHASE2_CA_PATH,
g_param_spec_string (NM_SETTING_802_1X_PHASE2_CA_PATH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_CA_PATH, "", "",
"Phase2 auth CA path",
"UTF-8 encoded path to a directory containing PEM or "
"DER formatted certificates to be added to the "
"verification chain in addition to the certificate "
"specified in the 'phase2-ca-cert' property.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-subject-match: * NMSetting8021x:phase2-subject-match:
@@ -3519,16 +3410,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_SUBJECT_MATCH, (object_class, PROP_PHASE2_SUBJECT_MATCH,
g_param_spec_string (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, "", "",
"Phase2 subject match",
"Substring to be matched against the subject of "
"the certificate presented by the authentication "
"server during the inner 'phase2' "
"authentication. When unset, no verification of "
"the authentication server certificate's subject "
"is performed.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-altsubject-matches: * NMSetting8021x:phase2-altsubject-matches:
@@ -3540,18 +3425,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_ALTSUBJECT_MATCHES, (object_class, PROP_PHASE2_ALTSUBJECT_MATCHES,
_nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, "", "",
"altSubjectName matches",
"List of strings to be matched against "
"List of strings to be matched against "
"the altSubjectName of the certificate "
"presented by the authentication server "
"during the inner 'phase 2' "
"authentication. If the list is empty, no "
"verification of the server certificate's "
"altSubjectName is performed.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-client-cert: * NMSetting8021x:phase2-client-cert:
@@ -3574,22 +3451,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_CLIENT_CERT, (object_class, PROP_PHASE2_CLIENT_CERT,
_nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "", "",
"Phase2 client certificate",
"Contains the 'phase 2' client certificate if "
"used by the EAP method specified in the "
"'phase2-auth' or 'phase2-autheap' properties. "
"Certificate data is specified using a 'scheme'; "
"two are currently supported: blob and path. "
"When using the blob scheme (which is backwards "
"compatible with NM 0.7.x) this property should "
"be set to the certificate's DER encoded data. "
"When using the path scheme, this property should "
"be set to the full UTF-8 encoded path of the "
"certificate, prefixed with the string 'file://' "
"and ending with a terminating NULL byte.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:password: * NMSetting8021x:password:
@@ -3600,25 +3465,24 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD, (object_class, PROP_PASSWORD,
g_param_spec_string (NM_SETTING_802_1X_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PASSWORD, "", "",
"Password",
"UTF-8 encoded password used for EAP authentication methods.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:password-flags: * NMSetting8021x:password-flags:
* *
* Flags indicating how to handle the #NMSetting8021x:password property. * Flags indicating how to handle the #NMSetting8021x:password property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_FLAGS, (object_class, PROP_PASSWORD_FLAGS,
"Password Flags", g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the 802.1x password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:password-raw: * NMSetting8021x:password-raw:
@@ -3630,30 +3494,24 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD_RAW, (object_class, PROP_PASSWORD_RAW,
_nm_param_spec_specialized (NM_SETTING_802_1X_PASSWORD_RAW, _nm_param_spec_specialized (NM_SETTING_802_1X_PASSWORD_RAW, "", "",
"Password byte array",
"Password used for EAP authentication "
"methods, given as a byte array to allow "
"passwords in other encodings than UTF-8 "
"to be used. If both 'password' and "
"'password-raw' are given, 'password' is "
"preferred.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:password-raw-flags: * NMSetting8021x:password-raw-flags:
* *
* Flags indicating how to handle the #NMSetting8021x:password-raw property. * Flags indicating how to handle the #NMSetting8021x:password-raw property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_RAW_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, (object_class, PROP_PASSWORD_RAW_FLAGS,
"Password byte array Flags", g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, "", "",
"Flags indicating how to handle the 802.1x password byte array.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:private-key: * NMSetting8021x:private-key:
@@ -3687,33 +3545,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIVATE_KEY, (object_class, PROP_PRIVATE_KEY,
_nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY, _nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY, "", "",
"Private key",
"Contains the private key when the 'eap' property "
"is set to 'tls'. Key data is specified using a "
"'scheme'; two are currently supported: blob and "
"path. When using the blob scheme and private "
"keys, this property should be set to the key's "
"encrypted PEM encoded data. When using private "
"keys with the path scheme, this property should "
"be set to the full UTF-8 encoded path of the key, "
"prefixed with the string 'file://' and ending "
"with a terminating NULL byte. When using "
"PKCS#12 format private keys and the blob "
"scheme, this property should be set to the "
"PKCS#12 data and the 'private-key-password' "
"property must be set to password used to "
"decrypt the PKCS#12 certificate and key. When "
"using PKCS#12 files and the path scheme, this "
"property should be set to the full UTF-8 encoded "
"path of the key, prefixed with the string "
"'file://' and and ending with a terminating NULL "
"byte, and as with the blob scheme the "
"'private-key-password' property must be set to "
"the password used to decode the PKCS#12 private "
"key and certificate.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:private-key-password: * NMSetting8021x:private-key-password:
@@ -3727,14 +3562,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIVATE_KEY_PASSWORD, (object_class, PROP_PRIVATE_KEY_PASSWORD,
g_param_spec_string (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, "", "",
"Private key password",
"The password used to decrypt the private key "
"specified in the 'private-key' property when the "
"private key either uses the path scheme, or if the "
"private key is a PKCS#12 format key.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:private-key-password-flags: * NMSetting8021x:private-key-password-flags:
@@ -3742,15 +3573,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
* Flags indicating how to handle the #NMSetting8021x:private-key-password * Flags indicating how to handle the #NMSetting8021x:private-key-password
* property. * property.
**/ **/
g_object_class_install_property (object_class, PROP_PRIVATE_KEY_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, (object_class, PROP_PRIVATE_KEY_PASSWORD_FLAGS,
"Private Key Password Flags", g_param_spec_uint (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the 802.1x private "
"key password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-private-key: * NMSetting8021x:phase2-private-key:
@@ -3779,34 +3609,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_PRIVATE_KEY, (object_class, PROP_PHASE2_PRIVATE_KEY,
_nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "", "",
"Phase2 private key",
"Contains the 'phase 2' inner private key when "
"the 'phase2-auth' or 'phase2-autheap' property "
"is set to 'tls'. Key data is specified using a "
"'scheme'; two are currently supported: blob and "
"path. When using the blob scheme and private "
"keys, this property should be set to the key's "
"encrypted PEM encoded data. When using private "
"keys with the path scheme, this property should "
"be set to the full UTF-8 encoded path of the key, "
"prefixed with the string 'file://' and ending "
"with a terminating NULL byte. When using "
"PKCS#12 format private keys and the blob "
"scheme, this property should be set to the "
"PKCS#12 data and the 'phase2-private-key-password' "
"property must be set to password used to "
"decrypt the PKCS#12 certificate and key. When "
"using PKCS#12 files and the path scheme, this "
"property should be set to the full UTF-8 encoded "
"path of the key, prefixed with the string "
"'file://' and and ending with a terminating NULL "
"byte, and as with the blob scheme the "
"'phase2-private-key-password' property must be "
"set to the password used to decode the PKCS#12 "
"private key and certificate.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-private-key-password: * NMSetting8021x:phase2-private-key-password:
@@ -3820,14 +3626,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD, (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD,
g_param_spec_string (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, "", "",
"Phase2 private key password",
"The password used to decrypt the 'phase 2' private "
"key specified in the 'private-key' property when the "
"phase2 private key either uses the path scheme, or "
"if the phase2 private key is a PKCS#12 format key.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:phase2-private-key-password-flags: * NMSetting8021x:phase2-private-key-password-flags:
@@ -3835,15 +3637,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
* Flags indicating how to handle the * Flags indicating how to handle the
* #NMSetting8021x:phase2-private-key-password property. * #NMSetting8021x:phase2-private-key-password property.
**/ **/
g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS,
"Phase2 Private Key Password Flags", g_param_spec_uint (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the 802.1x phase2 "
"private key password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:pin: * NMSetting8021x:pin:
@@ -3852,25 +3653,24 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PIN, (object_class, PROP_PIN,
g_param_spec_string (NM_SETTING_802_1X_PIN, g_param_spec_string (NM_SETTING_802_1X_PIN, "", "",
"PIN",
"PIN used for EAP authentication methods.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:pin-flags: * NMSetting8021x:pin-flags:
* *
* Flags indicating how to handle the #NMSetting8021x:pin property. * Flags indicating how to handle the #NMSetting8021x:pin property.
**/ **/
g_object_class_install_property (object_class, PROP_PIN_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_802_1X_PIN_FLAGS, (object_class, PROP_PIN_FLAGS,
"PIN Flags", g_param_spec_uint (NM_SETTING_802_1X_PIN_FLAGS, "", "",
"Flags indicating how to handle the 802.1x PIN.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSetting8021x:system-ca-certs: * NMSetting8021x:system-ca-certs:
@@ -3884,17 +3684,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SYSTEM_CA_CERTS, (object_class, PROP_SYSTEM_CA_CERTS,
g_param_spec_boolean (NM_SETTING_802_1X_SYSTEM_CA_CERTS, g_param_spec_boolean (NM_SETTING_802_1X_SYSTEM_CA_CERTS, "", "",
"Use system CA certificates",
"When TRUE, overrides 'ca-path' and 'phase2-ca-path' "
"properties using the system CA directory "
"specified at configure time with the "
"--system-ca-path switch. The certificates in "
"this directory are added to the verification "
"chain in addition to any certificates specified "
"by the 'ca-cert' and 'phase2-ca-cert' properties.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/* Initialize crypto lbrary. */ /* Initialize crypto lbrary. */
if (!nm_utils_init (&error)) { if (!nm_utils_init (&error)) {
@@ -3902,5 +3695,4 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
error->code, error->message); error->code, error->message);
g_error_free (error); g_error_free (error);
} }
} }

52
libnm-util/nm-setting-adsl.c
View File

@@ -387,11 +387,10 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_USERNAME, (object_class, PROP_USERNAME,
g_param_spec_string (NM_SETTING_ADSL_USERNAME, g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "",
"Username",
"Username used to authenticate with the pppoa service.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:password: * NMSettingAdsl:password:
@@ -400,25 +399,24 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD, (object_class, PROP_PASSWORD,
g_param_spec_string (NM_SETTING_ADSL_PASSWORD, g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "",
"Password",
"Password used to authenticate with the pppoa service.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:password-flags: * NMSettingAdsl:password-flags:
* *
* Flags indicating how to handle the #NMSettingAdsl:password property. * Flags indicating how to handle the #NMSettingAdsl:password property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_ADSL_PASSWORD_FLAGS, (object_class, PROP_PASSWORD_FLAGS,
"Password Flags", g_param_spec_uint (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the ADSL password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:protocol: * NMSettingAdsl:protocol:
@@ -427,11 +425,10 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PROTOCOL, (object_class, PROP_PROTOCOL,
g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "",
"Protocol",
"ADSL connection protocol.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:encapsulation: * NMSettingAdsl:encapsulation:
@@ -440,11 +437,10 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ENCAPSULATION, (object_class, PROP_ENCAPSULATION,
g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "",
"Encapsulation",
"Encapsulation of ADSL connection",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:vpi: * NMSettingAdsl:vpi:
@@ -453,11 +449,10 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_VPI, (object_class, PROP_VPI,
g_param_spec_uint (NM_SETTING_ADSL_VPI, g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "",
"VPI",
"VPI of ADSL connection",
0, 65536, 0, 0, 65536, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingAdsl:vci: * NMSettingAdsl:vci:
@@ -466,9 +461,8 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_VCI, (object_class, PROP_VCI,
g_param_spec_uint (NM_SETTING_ADSL_VCI, g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "",
"VCI",
"VCI of ADSL connection",
0, 65536, 0, 0, 65536, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

17
libnm-util/nm-setting-bluetooth.c
View File

@@ -279,11 +279,10 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BDADDR, (object_class, PROP_BDADDR,
_nm_param_spec_specialized (NM_SETTING_BLUETOOTH_BDADDR, _nm_param_spec_specialized (NM_SETTING_BLUETOOTH_BDADDR, "", "",
"Bluetooth address",
"The Bluetooth address of the device",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBluetooth:type: * NMSettingBluetooth:type:
@@ -293,12 +292,8 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_TYPE, (object_class, PROP_TYPE,
g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "",
"Connection type",
"Either '" NM_SETTING_BLUETOOTH_TYPE_DUN "' for "
"Dial-Up Networking connections or "
"'" NM_SETTING_BLUETOOTH_TYPE_PANU "' for "
"Personal Area Networking connections.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

17
libnm-util/nm-setting-bond.c
View File

@@ -795,11 +795,10 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INTERFACE_NAME, (object_class, PROP_INTERFACE_NAME,
g_param_spec_string (NM_SETTING_BOND_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BOND_INTERFACE_NAME, "", "",
"InterfaceName",
"The name of the virtual in-kernel bonding network interface",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBond:options: * NMSettingBond:options:
@@ -810,12 +809,8 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_OPTIONS, (object_class, PROP_OPTIONS,
_nm_param_spec_specialized (NM_SETTING_BOND_OPTIONS, _nm_param_spec_specialized (NM_SETTING_BOND_OPTIONS, "", "",
"Options",
"Dictionary of key/value pairs of bonding "
"options. Both keys and values must be "
"strings. Option names must contain only "
"alphanumeric characters (ie, [a-zA-Z0-9]).",
DBUS_TYPE_G_MAP_OF_STRING, DBUS_TYPE_G_MAP_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

24
libnm-util/nm-setting-bridge-port.c
View File

@@ -264,11 +264,10 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY, (object_class, PROP_PRIORITY,
g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
"Priority",
"The Spanning Tree Protocol (STP) priority of this bridge port",
0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY, 0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridgePort:path-cost: * NMSettingBridgePort:path-cost:
@@ -280,12 +279,10 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PATH_COST, (object_class, PROP_PATH_COST,
g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
"Path Cost",
"The Spanning Tree Protocol (STP) port cost for "
"destinations via this port.",
0, BR_MAX_PATH_COST, 100, 0, BR_MAX_PATH_COST, 100,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridgePort:hairpin-mode: * NMSettingBridgePort:hairpin-mode:
@@ -297,11 +294,8 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_HAIRPIN_MODE, (object_class, PROP_HAIRPIN_MODE,
g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "",
"Hairpin Mode",
"Enables or disabled 'hairpin mode' for the "
"port, which allows frames to be sent back out "
"through the port the frame was received on.",
FALSE, FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

63
libnm-util/nm-setting-bridge.c
View File

@@ -468,11 +468,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INTERFACE_NAME, (object_class, PROP_INTERFACE_NAME,
g_param_spec_string (NM_SETTING_BRIDGE_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BRIDGE_INTERFACE_NAME, "", "",
"InterfaceName",
"The name of the virtual in-kernel bridging network interface",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:mac-address: * NMSettingBridge:mac-address:
@@ -485,11 +484,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS, (object_class, PROP_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_BRIDGE_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "",
"MAC Address",
"The MAC address of the bridge",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:stp: * NMSettingBridge:stp:
@@ -500,12 +498,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_STP, (object_class, PROP_STP,
g_param_spec_boolean (NM_SETTING_BRIDGE_STP, g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "",
"STP",
"Controls whether Spanning Tree Protocol (STP) "
"is enabled for this bridge.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:priority: * NMSettingBridge:priority:
@@ -518,14 +514,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY, (object_class, PROP_PRIORITY,
g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "",
"Priority",
"Sets the Spanning Tree Protocol (STP) priority "
"for this bridge. Lower values are 'better'; the "
"lowest priority bridge will be elected the root "
"bridge.",
0, G_MAXUINT16, 0x8000, 0, G_MAXUINT16, 0x8000,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:forward-delay: * NMSettingBridge:forward-delay:
@@ -536,12 +528,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_FORWARD_DELAY, (object_class, PROP_FORWARD_DELAY,
g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "",
"ForwardDelay",
"The Spanning Tree Protocol (STP) forwarding "
"delay, in seconds.",
0, BR_MAX_FORWARD_DELAY, 15, 0, BR_MAX_FORWARD_DELAY, 15,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:hello-time: * NMSettingBridge:hello-time:
@@ -552,12 +542,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_HELLO_TIME, (object_class, PROP_HELLO_TIME,
g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "",
"HelloTime",
"The Spanning Tree Protocol (STP) hello time, in "
"seconds.",
0, BR_MAX_HELLO_TIME, 2, 0, BR_MAX_HELLO_TIME, 2,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:max-age: * NMSettingBridge:max-age:
@@ -568,12 +556,10 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAX_AGE, (object_class, PROP_MAX_AGE,
g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "",
"MaxAge",
"The Spanning Tree Protocol (STP) maximum message "
"age, in seconds.",
0, BR_MAX_MAX_AGE, 20, 0, BR_MAX_MAX_AGE, 20,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingBridge:ageing-time: * NMSettingBridge:ageing-time:
@@ -584,10 +570,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_AGEING_TIME, (object_class, PROP_AGEING_TIME,
g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "",
"AgeingTime",
"The Ethernet MAC address aging time, in seconds.",
0, BR_MAX_AGEING_TIME, 300, 0, BR_MAX_AGEING_TIME, 300,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

38
libnm-util/nm-setting-cdma.c
View File

@@ -308,14 +308,10 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NUMBER, (object_class, PROP_NUMBER,
g_param_spec_string (NM_SETTING_CDMA_NUMBER, g_param_spec_string (NM_SETTING_CDMA_NUMBER, "", "",
"Number",
"Number to dial when establishing a PPP data session "
"with the CDMA-based mobile broadband network. If not "
"specified, the default number (#777) is used when "
"required.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:username: * NMSettingCdma:username:
@@ -326,13 +322,10 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_USERNAME, (object_class, PROP_USERNAME,
g_param_spec_string (NM_SETTING_CDMA_USERNAME, g_param_spec_string (NM_SETTING_CDMA_USERNAME, "", "",
"Username",
"Username used to authenticate with the network, if "
"required. Note that many providers do not require "
"a username or accept any username.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:password: * NMSettingCdma:password:
@@ -343,25 +336,22 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD, (object_class, PROP_PASSWORD,
g_param_spec_string (NM_SETTING_CDMA_PASSWORD, g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "",
"Password",
"Password used to authenticate with the network, if "
"required. Note that many providers do not require "
"a password or accept any password.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingCdma:password-flags: * NMSettingCdma:password-flags:
* *
* Flags indicating how to handle the #NMSettingCdma:password property. * Flags indicating how to handle the #NMSettingCdma:password property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_CDMA_PASSWORD_FLAGS, (object_class, PROP_PASSWORD_FLAGS,
"Password Flags", g_param_spec_uint (NM_SETTING_CDMA_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the CDMA password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

155
libnm-util/nm-setting-connection.c
View File

@@ -1103,13 +1103,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ID, (object_class, PROP_ID,
g_param_spec_string (NM_SETTING_CONNECTION_ID, g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "",
"ID",
"User-readable connection identifier/name. Must be "
"one or more characters and may change over the lifetime "
"of the connection if the user decides to rename it.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:uuid: * NMSettingConnection:uuid:
@@ -1129,20 +1126,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_UUID, (object_class, PROP_UUID,
g_param_spec_string (NM_SETTING_CONNECTION_UUID, g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "",
"UUID",
"Universally unique connection identifier. Must be "
"in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' "
"(ie, contains only hexadecimal characters and '-'). "
"The UUID should be assigned when the connection is "
"created and never changed as long as the connection "
"still applies to the same network. For example, "
"it should not be changed when the user changes the "
"connection's 'id', but should be recreated when the "
"Wi-Fi SSID, mobile broadband network provider, or the "
"connection type changes.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:interface-name: * NMSettingConnection:interface-name:
@@ -1161,21 +1148,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INTERFACE_NAME, (object_class, PROP_INTERFACE_NAME,
g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "",
"Interface name",
"Interface name this connection is bound to. "
"If not set, then the connection can be attached "
"to any interface of the appropriate type (subject "
"to restrictions imposed by other settings). For "
"connection types where interface names cannot easily "
"be made persistent (e.g. mobile broadband or USB "
"Ethernet), this property should not be used. Setting "
"this property restricts the interfaces a connection can "
"be used with, and if interface names change or are "
"reordered the connection may be applied to the wrong "
"interface.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:type: * NMSettingConnection:type:
@@ -1188,17 +1164,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_TYPE, (object_class, PROP_TYPE,
g_param_spec_string (NM_SETTING_CONNECTION_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "",
"Type",
"Base type of the connection. For hardware-dependent "
"connections, should contain the setting name of the "
"hardware-type specific setting (ie, '802-3-ethernet' "
"or '802-11-wireless' or 'bluetooth', etc), and for "
"non-hardware dependent connections like VPN or "
"otherwise, should contain the setting name of that "
"setting type (ie, 'vpn' or 'bridge', etc).",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:permissions: * NMSettingConnection:permissions:
@@ -1217,25 +1186,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
*/ */
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PERMISSIONS, (object_class, PROP_PERMISSIONS,
_nm_param_spec_specialized (NM_SETTING_CONNECTION_PERMISSIONS, _nm_param_spec_specialized (NM_SETTING_CONNECTION_PERMISSIONS, "", "",
"Permissions",
"An array of strings defining what access a given "
"user has to this connection. If this is NULL or "
"empty, all users are allowed to access this "
"connection. Otherwise a user is allowed to access "
"this connection if and only if they are in this "
"array. Each entry is of the form "
"\"[type]:[id]:[reserved]\", for example: "
"\"user:dcbw:blah\" At this time only the 'user' "
"[type] is allowed. Any other values are ignored and "
"reserved for future use. [id] is the username that "
"this permission refers to, which may not contain the "
"':' character. Any [reserved] information (if "
"present) must be ignored and is reserved for future "
"use. All of [type], [id], and [reserved] must be "
"valid UTF-8.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:autoconnect: * NMSettingConnection:autoconnect:
@@ -1247,14 +1201,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_AUTOCONNECT, (object_class, PROP_AUTOCONNECT,
g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "",
"Autoconnect",
"If TRUE, NetworkManager will activate this connection "
"when its network resources are available. If FALSE, "
"the connection must be manually activated by the user "
"or some other mechanism.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:timestamp: * NMSettingConnection:timestamp:
@@ -1269,16 +1219,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_TIMESTAMP, (object_class, PROP_TIMESTAMP,
g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "",
"Timestamp",
"Timestamp (in seconds since the Unix Epoch) that the "
"connection was last successfully activated. NetworkManager "
"updates the connection timestamp periodically when the "
"connection is active to ensure that an active connection "
"has the latest timestamp. The property is only meant for "
"reading (changes to this property will not be preserved).",
0, G_MAXUINT64, 0, 0, G_MAXUINT64, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:read-only: * NMSettingConnection:read-only:
@@ -1289,14 +1233,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_READ_ONLY, (object_class, PROP_READ_ONLY,
g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "",
"Read-Only",
"If TRUE, the connection is read-only and cannot be "
"changed by the user or any other mechanism. This is "
"normally set for system connections whose plugin "
"cannot yet write updated connections back out.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:zone: * NMSettingConnection:zone:
@@ -1308,16 +1248,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ZONE, (object_class, PROP_ZONE,
g_param_spec_string (NM_SETTING_CONNECTION_ZONE, g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "",
"Zone",
"The trust level of a the connection."
"Free form case-insensitive string (for example "
"\"Home\", \"Work\", \"Public\"). NULL or "
"unspecified zone means the connection will be "
"placed in the default zone as defined by the "
"firewall.",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:master: * NMSettingConnection:master:
@@ -1326,12 +1260,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MASTER, (object_class, PROP_MASTER,
g_param_spec_string (NM_SETTING_CONNECTION_MASTER, g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "",
"Master",
"Interface name of the master device or UUID of "
"the master connection",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:slave-type: * NMSettingConnection:slave-type:
@@ -1342,13 +1274,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SLAVE_TYPE, (object_class, PROP_SLAVE_TYPE,
g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "",
"Slave-Type",
"Setting name describing the type of slave "
"this connection is (ie, 'bond') or NULL if this "
"connection is not a slave.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:secondaries: * NMSettingConnection:secondaries:
@@ -1361,13 +1290,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SECONDARIES, (object_class, PROP_SECONDARIES,
_nm_param_spec_specialized (NM_SETTING_CONNECTION_SECONDARIES, _nm_param_spec_specialized (NM_SETTING_CONNECTION_SECONDARIES, "", "",
"Secondaries",
"List of connection UUIDs that should be activated "
"when the base connection itself is activated. "
"Currently only VPN connections are supported.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingConnection:gateway-ping-timeout: * NMSettingConnection:gateway-ping-timeout:
@@ -1379,11 +1305,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_GATEWAY_PING_TIMEOUT, (object_class, PROP_GATEWAY_PING_TIMEOUT,
g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "",
"Gateway Ping Timeout",
"If greater than zero, delay success of IP "
"addressing until either the timeout is reached, or "
"an IP gateway replies to a ping.",
0, 30, 0, 0, 30, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
} }

152
libnm-util/nm-setting-dcb.c
View File

@@ -969,13 +969,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_FCOE_FLAGS, (object_class, PROP_APP_FCOE_FLAGS,
g_param_spec_uint (NM_SETTING_DCB_APP_FCOE_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "",
"App FCoE Flags",
"Specifies the flags for the DCB FCoE application. "
"Flags may be any combination of 0x1 (enable), 0x2 "
"(advertise), and 0x4 (willing).",
0, DCB_FLAGS_ALL, 0, 0, DCB_FLAGS_ALL, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fcoe-priority: * NMSettingDcb:app-fcoe-priority:
@@ -988,14 +985,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_FCOE_PRIORITY, (object_class, PROP_APP_FCOE_PRIORITY,
g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "",
"App FCoE Priority",
"The highest User Priority (0 - 7) which FCoE "
"frames should use, or -1 for default priority. Only "
"used when the 'app-fcoe-flags' property includes "
"the 'enabled' flag.",
-1, 7, -1, -1, 7, -1,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fcoe-mode: * NMSettingDcb:app-fcoe-mode:
@@ -1007,12 +1000,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_FCOE_MODE, (object_class, PROP_APP_FCOE_MODE,
g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "",
"App FCoE Mode",
"The FCoe controller mode; either 'fabric' (default) "
"or 'vn2vn'.",
NM_SETTING_DCB_FCOE_MODE_FABRIC, NM_SETTING_DCB_FCOE_MODE_FABRIC,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-iscsi-flags: * NMSettingDcb:app-iscsi-flags:
@@ -1025,13 +1016,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_ISCSI_FLAGS, (object_class, PROP_APP_ISCSI_FLAGS,
g_param_spec_uint (NM_SETTING_DCB_APP_ISCSI_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "",
"App iSCSI Flags",
"Specifies the flags for the DCB iSCSI application. "
"Flags may be any combination of 0x1 (enable), 0x2 "
"(advertise), and 0x4 (willing).",
0, DCB_FLAGS_ALL, 0, 0, DCB_FLAGS_ALL, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-iscsi-priority: * NMSettingDcb:app-iscsi-priority:
@@ -1044,14 +1032,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_ISCSI_PRIORITY, (object_class, PROP_APP_ISCSI_PRIORITY,
g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "",
"App iSCSI Priority",
"The highest User Priority (0 - 7) which iSCSI "
"frames should use, or -1 for default priority. Only "
"used when the 'app-iscsi-flags' property includes "
"the 'enabled' flag.",
-1, 7, -1, -1, 7, -1,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fip-flags: * NMSettingDcb:app-fip-flags:
@@ -1064,13 +1048,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_FIP_FLAGS, (object_class, PROP_APP_FIP_FLAGS,
g_param_spec_uint (NM_SETTING_DCB_APP_FIP_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_FIP_FLAGS, "", "",
"App FIP Flags",
"Specifies the flags for the DCB FIP application. "
"Flags may be any combination of 0x1 (enable), 0x2 "
"(advertise), and 0x4 (willing).",
0, DCB_FLAGS_ALL, 0, 0, DCB_FLAGS_ALL, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:app-fip-priority: * NMSettingDcb:app-fip-priority:
@@ -1083,14 +1064,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APP_FIP_PRIORITY, (object_class, PROP_APP_FIP_PRIORITY,
g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "",
"App FIP Priority",
"The highest User Priority (0 - 7) which FIP "
"frames should use, or -1 for default priority. Only "
"used when the 'app-fip-flags' property includes "
"the 'enabled' flag.",
-1, 7, -1, -1, 7, -1,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-flow-control-flags: * NMSettingDcb:priority-flow-control-flags:
@@ -1103,13 +1080,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PFC_FLAGS, (object_class, PROP_PFC_FLAGS,
g_param_spec_uint (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, g_param_spec_uint (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "",
"Priority Flow Control Flags",
"Specifies the flags for DCB Priority Flow Control. "
"Flags may be any combination of 0x1 (enable), 0x2 "
"(advertise), and 0x4 (willing).",
0, DCB_FLAGS_ALL, 0, 0, DCB_FLAGS_ALL, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-flow-control: * NMSettingDcb:priority-flow-control:
@@ -1123,16 +1097,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PFC, (object_class, PROP_PFC,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "",
"Priority Flow Control",
"An array of 8 uint values, where the array index "
"corresponds to the User Priority (0 - 7) and the "
"value indicates whether or not the corresponding "
"priority should transmit priority pause. Allowed "
"values are 0 (do not transmit pause) and 1 "
"(transmit pause).",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-group-flags: * NMSettingDcb:priority-group-flags:
@@ -1145,13 +1113,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_GROUP_FLAGS, (object_class, PROP_PRIORITY_GROUP_FLAGS,
g_param_spec_uint (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, g_param_spec_uint (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "",
"Priority Group Flags",
"Specifies the flags for DCB Priority Groups. "
"Flags may be any combination of 0x1 (enable), 0x2 "
"(advertise), and 0x4 (willing).",
0, DCB_FLAGS_ALL, 0, 0, DCB_FLAGS_ALL, 0,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-group-id: * NMSettingDcb:priority-group-id:
@@ -1164,15 +1129,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_GROUP_ID, (object_class, PROP_PRIORITY_GROUP_ID,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_ID, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "",
"Priority Group ID",
"An array of 8 uint values, where the array "
"index corresponds to the User Priority (0 - 7) "
"and the value indicates the Priority Group ID. "
"Allowed Priority Group ID values are 0 - 7 or "
"15 for the unrestricted group.",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-group-bandwidth: * NMSettingDcb:priority-group-bandwidth:
@@ -1186,15 +1146,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_GROUP_BANDWIDTH, (object_class, PROP_PRIORITY_GROUP_BANDWIDTH,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "",
"Priority Group Bandwidth",
"An array of 8 uint values, where the array index "
"corresponds to the Priority Group ID (0 - 7) and "
"the value indicates the percentage of link bandwidth "
"allocated to that group. Allowed values are 0 - 100, "
"and the sum of all values must total 100 percent.",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-bandwidth: * NMSettingDcb:priority-bandwidth:
@@ -1209,16 +1164,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_BANDWIDTH, (object_class, PROP_PRIORITY_BANDWIDTH,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_BANDWIDTH, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "",
"Priority Bandwidth",
"An array of 8 uint values, where the array index "
"corresponds to the User Priority (0 - 7) and the "
"value indicates the percentage of bandwidth of "
"the priority's assigned group that the priority may "
"use. The sum of all percentages for priorities which "
"belong to the same group must total 100 percent.",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-strict-bandwidth: * NMSettingDcb:priority-strict-bandwidth:
@@ -1233,17 +1182,10 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_STRICT, (object_class, PROP_PRIORITY_STRICT,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "",
"Priority Strict Bandwidth",
"An array of 8 uint values, where the array index "
"corresponds to the User Priority (0 - 7) and the "
"value indicates whether or not the priority may "
"use all of the bandwidth allocated to its assigned "
"group. Allowed values are 0 (the priority may not "
"utilize all bandwidth) or 1 (the priority may "
"utilize all bandwidth).",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingDcb:priority-traffic-class: * NMSettingDcb:priority-traffic-class:
@@ -1256,13 +1198,9 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PRIORITY_TRAFFIC_CLASS, (object_class, PROP_PRIORITY_TRAFFIC_CLASS,
_nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "",
"Priority Traffic Class",
"An array of 8 uint values, where the array index "
"corresponds to the User Priority (0 - 7) and the "
"value indicates the traffic class (0 - 7) to which "
"the priority is mapped.",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

119
libnm-util/nm-setting-gsm.c
View File

@@ -554,16 +554,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NUMBER, (object_class, PROP_NUMBER,
g_param_spec_string (NM_SETTING_GSM_NUMBER, g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "",
"Number",
"Number to dial when establishing a PPP data session "
"with the GSM-based mobile broadband network. Many "
"modems do not require PPP for connections to the "
"mobile network and thus this property should be left "
"blank, which allows NetworkManager to select the "
"appropriate settings automatically.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:username: * NMSettingGsm:username:
@@ -574,13 +568,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_USERNAME, (object_class, PROP_USERNAME,
g_param_spec_string (NM_SETTING_GSM_USERNAME, g_param_spec_string (NM_SETTING_GSM_USERNAME, "", "",
"Username",
"Username used to authenticate with the network, if "
"required. Note that many providers do not require "
"a username or accept any username.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:password: * NMSettingGsm:password:
@@ -591,27 +582,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD, (object_class, PROP_PASSWORD,
g_param_spec_string (NM_SETTING_GSM_PASSWORD, g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "",
"Password",
"Password used to authenticate with the network, if "
"required. Note that many providers do not require "
"a password or accept any password.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:password-flags: * NMSettingGsm:password-flags:
* *
* Flags indicating how to handle the #NMSettingGsm:password property. * Flags indicating how to handle the #NMSettingGsm:password property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_GSM_PASSWORD_FLAGS, (object_class, PROP_PASSWORD_FLAGS,
"Password Flags", g_param_spec_uint (NM_SETTING_GSM_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the GSM password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:apn: * NMSettingGsm:apn:
@@ -626,19 +614,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_APN, (object_class, PROP_APN,
g_param_spec_string (NM_SETTING_GSM_APN, g_param_spec_string (NM_SETTING_GSM_APN, "", "",
"APN",
"The GPRS Access Point Name specifying the APN used "
"when establishing a data session with the GSM-based "
"network. The APN often determines how the user will "
"be billed for their network usage and whether the "
"user has access to the Internet or just a provider-"
"specific walled-garden, so it is important to use "
"the correct APN for the user's mobile broadband "
"plan. The APN may only be composed of the characters "
"a-z, 0-9, ., and - per GSM 03.60 Section 14.9.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:network-id: * NMSettingGsm:network-id:
@@ -651,17 +630,10 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NETWORK_ID, (object_class, PROP_NETWORK_ID,
g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, "", "",
"Network ID",
"The Network ID (GSM LAI format, ie MCC-MNC) to force "
"specific network registration. If the Network ID is "
"specified, NetworkManager will attempt to force the "
"device to register only on the specified network. "
"This can be used to ensure that the device does not "
"roam when direct roaming control of the device is "
"not otherwise possible.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:network-type: * NMSettingGsm:network-type:
@@ -681,19 +653,12 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NETWORK_TYPE, (object_class, PROP_NETWORK_TYPE,
g_param_spec_int (NM_SETTING_GSM_NETWORK_TYPE, g_param_spec_int (NM_SETTING_GSM_NETWORK_TYPE, "", "",
"Network type",
"Network preference to force the device to only use "
"specific network technologies. The permitted values "
"are: -1: any, 0: 3G only, 1: GPRS/EDGE only, "
"2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. "
"Notes: This property is deprecated and NetworkManager from 0.9.10 "
"onwards doesn't use this property when talking to ModemManager."
"Also, not all devices allow network preference control.",
NM_SETTING_GSM_NETWORK_TYPE_ANY, NM_SETTING_GSM_NETWORK_TYPE_ANY,
NM_SETTING_GSM_NETWORK_TYPE_4G, NM_SETTING_GSM_NETWORK_TYPE_4G,
NM_SETTING_GSM_NETWORK_TYPE_ANY, NM_SETTING_GSM_NETWORK_TYPE_ANY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:allowed-bands: * NMSettingGsm:allowed-bands:
@@ -707,16 +672,12 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ALLOWED_BANDS, (object_class, PROP_ALLOWED_BANDS,
g_param_spec_uint (NM_SETTING_GSM_ALLOWED_BANDS, g_param_spec_uint (NM_SETTING_GSM_ALLOWED_BANDS, "", "",
"Allowed Bands",
"Bitfield of allowed frequency bands."
"Notes: This property is deprecated and NetworkManager from 0.9.10 "
"onwards doesn't use this property when talking to ModemManager."
"Also, not all devices allow frequency band control.",
NM_SETTING_GSM_BAND_UNKNOWN, NM_SETTING_GSM_BAND_UNKNOWN,
NM_SETTING_GSM_BANDS_MAX, NM_SETTING_GSM_BANDS_MAX,
NM_SETTING_GSM_BAND_ANY, NM_SETTING_GSM_BAND_ANY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:pin: * NMSettingGsm:pin:
@@ -727,27 +688,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PIN, (object_class, PROP_PIN,
g_param_spec_string (NM_SETTING_GSM_PIN, g_param_spec_string (NM_SETTING_GSM_PIN, "", "",
"PIN",
"If the SIM is locked with a PIN it must be unlocked "
"before any other operations are requested. Specify "
"the PIN here to allow operation of the device.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:pin-flags: * NMSettingGsm:pin-flags:
* *
* Flags indicating how to handle the #NMSettingGsm:pin property. * Flags indicating how to handle the #NMSettingGsm:pin property.
**/ **/
g_object_class_install_property (object_class, PROP_PIN_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_GSM_PIN_FLAGS, (object_class, PROP_PIN_FLAGS,
"PIN Flags", g_param_spec_uint (NM_SETTING_GSM_PIN_FLAGS, "", "",
"Flags indicating how to handle the GSM SIM PIN.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingGsm:home-only: * NMSettingGsm:home-only:
@@ -757,11 +715,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_HOME_ONLY, (object_class, PROP_HOME_ONLY,
g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, "", "",
"Home Only",
"When TRUE, only connections to the home network will "
"be allowed. Connections to roaming networks will "
"not be made.",
FALSE, FALSE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

41
libnm-util/nm-setting-infiniband.c
View File

@@ -359,14 +359,10 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS, (object_class, PROP_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_INFINIBAND_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "",
"Device MAC Address",
"If specified, this connection will only apply to "
"the IPoIB device whose permanent MAC address matches. "
"This property does not change the MAC address "
"of the device (i.e. MAC spoofing).",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:mtu: * NMSettingInfiniband:mtu:
@@ -376,13 +372,10 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MTU, (object_class, PROP_MTU,
g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "",
"MTU",
"If non-zero, only transmit packets of the specified "
"size or smaller, breaking larger packets up into "
"multiple frames.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:transport-mode: * NMSettingInfiniband:transport-mode:
@@ -392,11 +385,10 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_TRANSPORT_MODE, (object_class, PROP_TRANSPORT_MODE,
g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "",
"Transport Mode",
"The IPoIB transport mode. Either 'datagram' or 'connected'.",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:p-key: * NMSettingInfiniband:p-key:
@@ -408,12 +400,10 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_P_KEY, (object_class, PROP_P_KEY,
g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "",
"P_Key",
"The InfiniBand P_Key. Either -1 for the "
"default, or a 16-bit unsigned integer.",
-1, 0xFFFF, -1, -1, 0xFFFF, -1,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingInfiniband:parent: * NMSettingInfiniband:parent:
@@ -425,10 +415,9 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PARENT, (object_class, PROP_PARENT,
g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "",
"Parent",
"The interface name of the parent device, or NULL",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

169
libnm-util/nm-setting-ip4-config.c
View File

@@ -1236,27 +1236,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_METHOD, (object_class, PROP_METHOD,
g_param_spec_string (NM_SETTING_IP4_CONFIG_METHOD, g_param_spec_string (NM_SETTING_IP4_CONFIG_METHOD, "", "",
"Method",
"IPv4 configuration method. If 'auto' is specified "
"then the appropriate automatic method (DHCP, PPP, "
"etc) is used for the interface and most other "
"properties can be left unset. If 'link-local' "
"is specified, then a link-local address in the "
"169.254/16 range will be assigned to the "
"interface. If 'manual' is specified, static IP "
"addressing is used and at least one IP address "
"must be given in the 'addresses' property. If "
"'shared' is specified (indicating that this "
"connection will provide network access to other "
"computers) then the interface is assigned an "
"address in the 10.42.x.1/24 range and a DHCP and "
"forwarding DNS server are started, and the "
"interface is NAT-ed to the current default network "
"connection. 'disabled' means IPv4 will not be "
"used on this connection. This property must be set.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:dns: * NMSettingIP4Config:dns:
@@ -1270,18 +1253,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DNS, (object_class, PROP_DNS,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, "", "",
"DNS",
"List of DNS servers (network byte order). For "
"the 'auto' method, these DNS servers are "
"appended to those (if any) returned by automatic "
"configuration. DNS servers cannot be used with "
"the 'shared', 'link-local', or 'disabled' "
"methods as there is no upstream network. In all "
"other methods, these DNS servers are used as the "
"only DNS servers for this connection.",
DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:dns-search: * NMSettingIP4Config:dns-search:
@@ -1294,18 +1269,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DNS_SEARCH, (object_class, PROP_DNS_SEARCH,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH, "", "",
"DNS search",
"List of DNS search domains. For the 'auto' "
"method, these search domains are appended to "
"those returned by automatic configuration. "
"Search domains cannot be used with the 'shared', "
"'link-local', or 'disabled' methods as there is "
"no upstream network. In all other methods, these "
"search domains are used as the only search domains "
"for this connection.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:addresses: * NMSettingIP4Config:addresses:
@@ -1321,30 +1288,17 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ADDRESSES, (object_class, PROP_ADDRESSES,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, "", "",
"Addresses",
"Array of IPv4 address structures. Each IPv4 "
"address structure is composed of 3 32-bit values; "
"the first being the IPv4 address (network byte "
"order), the second the prefix (1 - 32), and "
"last the IPv4 gateway (network byte order). The "
"gateway may be left as 0 if no gateway exists "
"for that subnet. For the 'auto' method, given "
"IP addresses are appended to those returned by "
"automatic configuration. Addresses cannot be "
"used with the 'shared', 'link-local', or "
"'disabled' methods as addressing is either "
"automatic or disabled with these methods.",
DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ADDRESS_LABELS, (object_class, PROP_ADDRESS_LABELS,
_nm_param_spec_specialized ("address-labels", _nm_param_spec_specialized ("address-labels", "", "",
"Address labels",
"Internal use only",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:routes: * NMSettingIP4Config:routes:
@@ -1360,22 +1314,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ROUTES, (object_class, PROP_ROUTES,
_nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, "", "",
"Routes",
"Array of IPv4 route structures. Each IPv4 route "
"structure is composed of 4 32-bit values; the "
"first being the destination IPv4 network or "
"address (network byte order), the second the "
"destination network or address prefix (1 - 32), "
"the third being the next-hop (network byte order) "
"if any, and the fourth being the route metric. "
"For the 'auto' method, given IP routes are "
"appended to those returned by automatic "
"configuration. Routes cannot be used with the "
"'shared', 'link-local', or 'disabled', methods "
"as there is no upstream network.",
DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:ignore-auto-routes: * NMSettingIP4Config:ignore-auto-routes:
@@ -1386,14 +1328,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IGNORE_AUTO_ROUTES, (object_class, PROP_IGNORE_AUTO_ROUTES,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, "", "",
"Ignore automatic routes",
"When the method is set to 'auto' and this property "
"to TRUE, automatically configured routes are "
"ignored and only routes specified in the 'routes' "
"property, if any, are used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:ignore-auto-dns: * NMSettingIP4Config:ignore-auto-dns:
@@ -1406,15 +1344,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IGNORE_AUTO_DNS, (object_class, PROP_IGNORE_AUTO_DNS,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, "", "",
"Ignore automatic DNS",
"When the method is set to 'auto' and this property "
"to TRUE, automatically configured nameservers and "
"search domains are ignored and only nameservers and "
"search domains specified in the 'dns' and 'dns-search' "
"properties, if any, are used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:dhcp-client-id: * NMSettingIP4Config:dhcp-client-id:
@@ -1424,13 +1357,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DHCP_CLIENT_ID, (object_class, PROP_DHCP_CLIENT_ID,
g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "",
"DHCP Client ID",
"A string sent to the DHCP server to identify the "
"local machine which the DHCP server may use to "
"customize the DHCP lease and options.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:dhcp-send-hostname: * NMSettingIP4Config:dhcp-send-hostname:
@@ -1443,17 +1373,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DHCP_SEND_HOSTNAME, (object_class, PROP_DHCP_SEND_HOSTNAME,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME, "", "",
"Send DHCP hostname",
"If TRUE, a hostname is sent to the DHCP server when "
"acquiring a lease. Some DHCP servers use this "
"hostname to update DNS databases, essentially "
"providing a static hostname for the computer. If "
"the 'dhcp-hostname' property is empty and this "
"property is TRUE, the current persistent hostname "
"of the computer is sent.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:dhcp-hostname: * NMSettingIP4Config:dhcp-hostname:
@@ -1463,13 +1386,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DHCP_HOSTNAME, (object_class, PROP_DHCP_HOSTNAME,
g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, "", "",
"DHCP Hostname",
"If the 'dhcp-send-hostname' property is TRUE, then "
"the specified name will be sent to the DHCP server "
"when acquiring a lease.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:never-default: * NMSettingIP4Config:never-default:
@@ -1479,13 +1399,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NEVER_DEFAULT, (object_class, PROP_NEVER_DEFAULT,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, "", "",
"Never default",
"If TRUE, this connection will never be the default "
"IPv4 connection, meaning it will never be assigned "
"the default route by NetworkManager.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP4Config:may-fail: * NMSettingIP4Config:may-fail:
@@ -1499,18 +1416,10 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAY_FAIL, (object_class, PROP_MAY_FAIL,
g_param_spec_boolean (NM_SETTING_IP4_CONFIG_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_MAY_FAIL, "", "",
"May Fail",
"If TRUE, allow overall network configuration to "
"proceed even if IPv4 configuration times out. "
"Note that at least one IP configuration must "
"succeed or overall network configuration will still "
"fail. For example, in IPv6-only networks, setting "
"this property to TRUE allows the overall network "
"configuration to succeed if IPv4 configuration "
"fails but IPv6 configuration completes successfully.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
} }

155
libnm-util/nm-setting-ip6-config.c
View File

@@ -1032,24 +1032,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_METHOD, (object_class, PROP_METHOD,
g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD, g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD, "", "",
"Method",
"IPv6 configuration method. If 'auto' is specified "
"then the appropriate automatic method (PPP, router "
"advertisement, etc) is used for the device and "
"most other properties can be left unset. To force "
"the use of DHCP only, specify 'dhcp'; this method "
"is only valid for Ethernet-based hardware. If "
"'link-local' is specified, then an IPv6 link-local "
"address will be assigned to the interface. If "
"'manual' is specified, static IP addressing is "
"used and at least one IP address must be given in "
" the 'addresses' property. If 'ignore' is "
"specified, IPv6 configuration is not done. This "
"property must be set. Note: the 'shared' method "
"is not yet supported.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:dhcp-hostname: * NMSettingIP6Config:dhcp-hostname:
@@ -1061,12 +1047,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DHCP_HOSTNAME, (object_class, PROP_DHCP_HOSTNAME,
g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, "", "",
"DHCP Hostname",
"The specified name will be sent to the DHCP server "
"when acquiring a lease.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:dns: * NMSettingIP6Config:dns:
@@ -1081,20 +1065,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DNS, (object_class, PROP_DNS,
_nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, "", "",
"DNS",
"Array of DNS servers, where each member of the "
"array is a byte array containing the IPv6 address "
"of the DNS server (in network byte order). For "
"the 'auto' method, these DNS servers are "
"appended to those (if any) returned by automatic "
"configuration. DNS servers cannot be used with "
"the 'shared' or 'link-local' methods as there is "
"no usptream network. In all other methods, "
"these DNS servers are used as the only DNS "
"servers for this connection.",
DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:dns-search: * NMSettingIP6Config:dns-search:
@@ -1107,18 +1081,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DNS_SEARCH, (object_class, PROP_DNS_SEARCH,
_nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH, "", "",
"DNS search",
"List of DNS search domains. For the 'auto' "
"method, these search domains are appended to "
"those returned by automatic configuration. "
"Search domains cannot be used with the 'shared' "
"or 'link-local' methods as there is no upstream "
"network. In all other methods, these search "
"domains are used as the only search domains for "
"this connection.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:addresses: * NMSettingIP6Config:addresses:
@@ -1136,25 +1102,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ADDRESSES, (object_class, PROP_ADDRESSES,
_nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, "", "",
"Addresses",
"Array of IPv6 address structures. Each IPv6 "
"address structure is composed of 3 members, the "
"first being a byte array containing the IPv6 "
"address (network byte order), the second a "
"32-bit integer containing the IPv6 address "
"prefix, and the third a byte array containing "
"the IPv6 address (network byte order) of the "
"gateway associated with this address, if any. "
"If no gateway is given, the third element should "
"be given as all zeros. For the 'auto' method, "
"given IP addresses are appended to those returned "
"by automatic configuration. Addresses cannot be "
"used with the 'shared' or 'link-local' methods "
"as the interface is automatically assigned an "
"address with these methods.",
DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:routes: * NMSettingIP6Config:routes:
@@ -1170,22 +1121,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ROUTES, (object_class, PROP_ROUTES,
_nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, "", "",
"Routes",
"Array of IPv6 route structures. Each IPv6 route "
"structure is composed of 4 members; the first "
"being the destination IPv6 network or address "
"(network byte order) as a byte array, the second "
"the destination network or address IPv6 prefix, "
"the third being the next-hop IPv6 address "
"(network byte order) if any, and the fourth "
"being the route metric. For the 'auto' method, "
"given IP routes are appended to those returned "
"by automatic configuration. Routes cannot be "
"used with the 'shared' or 'link-local' methods "
"because there is no upstream network.",
DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:ignore-auto-routes: * NMSettingIP6Config:ignore-auto-routes:
@@ -1196,14 +1135,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IGNORE_AUTO_ROUTES, (object_class, PROP_IGNORE_AUTO_ROUTES,
g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, "", "",
"Ignore automatic routes",
"When the method is set to 'auto' or 'dhcp' and this "
"property is set to TRUE, automatically configured "
"routes are ignored and only routes specified in the "
"'routes' property, if any, are used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:ignore-auto-dns: * NMSettingIP6Config:ignore-auto-dns:
@@ -1216,15 +1151,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IGNORE_AUTO_DNS, (object_class, PROP_IGNORE_AUTO_DNS,
g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, "", "",
"Ignore DHCPv6/RDNSS DNS",
"When the method is set to 'auto' or 'dhcp' and this "
"property is set to TRUE, automatically configured "
"nameservers and search domains are ignored and only "
"nameservers and search domains specified in the 'dns' "
"and 'dns-search' properties, if any, are used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:never-default: * NMSettingIP6Config:never-default:
@@ -1235,13 +1165,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NEVER_DEFAULT, (object_class, PROP_NEVER_DEFAULT,
g_param_spec_boolean (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, "", "",
"Never default",
"If TRUE, this connection will never be the default "
"IPv6 connection, meaning it will never be assigned "
"the default IPv6 route by NetworkManager.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:may-fail: * NMSettingIP6Config:may-fail:
@@ -1255,18 +1182,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAY_FAIL, (object_class, PROP_MAY_FAIL,
g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, "", "",
"May Fail",
"If TRUE, allow overall network configuration to "
"proceed even if IPv6 configuration times out. "
"Note that at least one IP configuration must "
"succeed or overall network configuration will still "
"fail. For example, in IPv4-only networks, setting "
"this property to TRUE allows the overall network "
"configuration to succeed if IPv6 configuration "
"fails but IPv4 configuration completes successfully.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingIP6Config:ip6-privacy: * NMSettingIP6Config:ip6-privacy:
@@ -1281,20 +1200,12 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_IP6_PRIVACY, (object_class, PROP_IP6_PRIVACY,
g_param_spec_int (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, g_param_spec_int (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
"Configure IPv6 Privacy",
"Configure IPv6 Privacy Extensions for SLAAC, described "
"in RFC4941. If enabled, it makes the kernel generate "
"a temporary IPv6 address in addition to the public one "
"generated from MAC address via modified EUI-64. This "
"enhances privacy, but could cause problems in some "
"applications, on the other hand. The permitted values "
"are: 0: disabled, 1: enabled (prefer public address), "
"2: enabled (prefer temporary addresses).",
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
} }
/********************************************************************/ /********************************************************************/

25
libnm-util/nm-setting-olpc-mesh.c
View File

@@ -243,11 +243,10 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SSID, (object_class, PROP_SSID,
_nm_param_spec_specialized (NM_SETTING_OLPC_MESH_SSID, _nm_param_spec_specialized (NM_SETTING_OLPC_MESH_SSID, "", "",
"SSID",
"SSID of the mesh network to join.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOlpcMesh:channel: * NMSettingOlpcMesh:channel:
@@ -256,11 +255,10 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CHANNEL, (object_class, PROP_CHANNEL,
g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "",
"Channel",
"Channel on which the mesh network to join is located.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingOlpcMesh:dhcp-anycast-address: * NMSettingOlpcMesh:dhcp-anycast-address:
@@ -271,13 +269,8 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DHCP_ANYCAST_ADDRESS, (object_class, PROP_DHCP_ANYCAST_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, _nm_param_spec_specialized (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", "",
"Anycast DHCP MAC address",
"Anycast DHCP MAC address used when "
"requesting an IP address via DHCP. The "
"specific anycast address used determines "
"which DHCP server class answers the "
"the request.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

155
libnm-util/nm-setting-ppp.c
View File

@@ -572,14 +572,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NOAUTH, (object_class, PROP_NOAUTH,
g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "",
"NoAuth",
"If TRUE, do not require the other side (usually the "
"PPP server) to authenticate itself to the client. "
"If FALSE, require authentication from the remote "
"side. In almost all cases, this should be TRUE.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:refuse-eap: * NMSettingPPP:refuse-eap:
@@ -588,11 +584,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_EAP, (object_class, PROP_REFUSE_EAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "",
"Refuse EAP",
"If TRUE, the EAP authentication method will not be used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:refuse-pap: * NMSettingPPP:refuse-pap:
@@ -601,11 +596,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_PAP, (object_class, PROP_REFUSE_PAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "",
"Refuse PAP",
"If TRUE, the PAP authentication method will not be used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:refuse-chap: * NMSettingPPP:refuse-chap:
@@ -614,11 +608,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_CHAP, (object_class, PROP_REFUSE_CHAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "",
"Refuse CHAP",
"If TRUE, the CHAP authentication method will not be used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:refuse-mschap: * NMSettingPPP:refuse-mschap:
@@ -627,11 +620,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_MSCHAP, (object_class, PROP_REFUSE_MSCHAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "",
"Refuse MSCHAP",
"If TRUE, the MSCHAP authentication method will not be used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:refuse-mschapv2: * NMSettingPPP:refuse-mschapv2:
@@ -640,11 +632,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_MSCHAPV2, (object_class, PROP_REFUSE_MSCHAPV2,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "",
"Refuse MSCHAPv2",
"If TRUE, the MSCHAPv2 authentication method will not be used.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:nobsdcomp: * NMSettingPPP:nobsdcomp:
@@ -653,11 +644,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NOBSDCOMP, (object_class, PROP_NOBSDCOMP,
g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "",
"No BSD compression",
"If TRUE, BSD compression will not be requested.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:nodeflate: * NMSettingPPP:nodeflate:
@@ -666,11 +656,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NODEFLATE, (object_class, PROP_NODEFLATE,
g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "",
"No deflate",
"If TRUE, 'deflate' compression will not be requested.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:no-vj-comp: * NMSettingPPP:no-vj-comp:
@@ -679,11 +668,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NO_VJ_COMP, (object_class, PROP_NO_VJ_COMP,
g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "",
"No VJ compression",
"If TRUE, Van Jacobsen TCP header compression will not be requested.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:require-mppe: * NMSettingPPP:require-mppe:
@@ -695,15 +683,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REQUIRE_MPPE, (object_class, PROP_REQUIRE_MPPE,
g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "",
"Require MPPE",
"If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) "
"will be required for the PPP session. If either "
"64-bit or 128-bit MPPE is not available the session "
"will fail. Note that MPPE is not used on mobile "
"broadband connections.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:require-mppe-128: * NMSettingPPP:require-mppe-128:
@@ -714,15 +697,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REQUIRE_MPPE_128, (object_class, PROP_REQUIRE_MPPE_128,
g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "",
"Require MPPE 128",
"If TRUE, 128-bit MPPE (Microsoft Point-to-Point "
"Encrpytion) will be required for the PPP session, "
"and the '" NM_SETTING_PPP_REQUIRE_MPPE "' property "
"must also be set to TRUE. If 128-bit MPPE is not "
"available the session will fail.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:mppe-stateful: * NMSettingPPP:mppe-stateful:
@@ -732,12 +710,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MPPE_STATEFUL, (object_class, PROP_MPPE_STATEFUL,
g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "",
"MPPE stateful",
"If TRUE, stateful MPPE is used. See pppd documentation "
"for more information on stateful MPPE.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:crtscts: * NMSettingPPP:crtscts:
@@ -748,14 +724,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CRTSCTS, (object_class, PROP_CRTSCTS,
g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "",
"CRTSCTS",
"If TRUE, specify that pppd should set the serial "
"port to use hardware flow control with RTS and CTS "
"signals. This value should normally be set to "
"FALSE.",
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:baud: * NMSettingPPP:baud:
@@ -766,13 +738,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BAUD, (object_class, PROP_BAUD,
g_param_spec_uint (NM_SETTING_PPP_BAUD, g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "",
"Baud",
"If non-zero, instruct pppd to set the serial port to "
"the specified baudrate. This value should normally be "
"left as 0 to automatically choose the speed.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:mru: * NMSettingPPP:mru:
@@ -783,13 +752,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
*/ */
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MRU, (object_class, PROP_MRU,
g_param_spec_uint (NM_SETTING_PPP_MRU, g_param_spec_uint (NM_SETTING_PPP_MRU, "", "",
"MRU",
"If non-zero, instruct pppd to request that the peer "
"send packets no larger than the specified size. If "
"non-zero, the MRU should be between 128 and 16384.",
0, 16384, 0, 0, 16384, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:mtu: * NMSettingPPP:mtu:
@@ -799,12 +765,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MTU, (object_class, PROP_MTU,
g_param_spec_uint (NM_SETTING_PPP_MTU, g_param_spec_uint (NM_SETTING_PPP_MTU, "", "",
"MTU",
"If non-zero, instruct pppd to send packets no larger "
"than the specified size.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:lcp-echo-failure: * NMSettingPPP:lcp-echo-failure:
@@ -816,16 +780,10 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_LCP_ECHO_FAILURE, (object_class, PROP_LCP_ECHO_FAILURE,
g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "",
"LCP echo failure",
"If non-zero, instruct pppd to presume the connection to "
"the peer has failed if the specified number of LCP "
"echo-requests go unanswered by the peer. The "
"'" NM_SETTING_PPP_LCP_ECHO_INTERVAL "' property must "
"also be set to a non-zero value if this property is "
"used.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPP:lcp-echo-interval: * NMSettingPPP:lcp-echo-interval:
@@ -837,13 +795,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_LCP_ECHO_INTERVAL, (object_class, PROP_LCP_ECHO_INTERVAL,
g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "",
"LCP echo interval",
"If non-zero, instruct pppd to send an LCP echo-request "
"frame to the peer every n seconds (where n is the "
"specified value). Note that some PPP peers will respond "
"to echo requests and some will not, and it is not "
"possible to autodetect this.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
} }

36
libnm-util/nm-setting-pppoe.c
View File

@@ -299,16 +299,10 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SERVICE, (object_class, PROP_SERVICE,
g_param_spec_string (NM_SETTING_PPPOE_SERVICE, g_param_spec_string (NM_SETTING_PPPOE_SERVICE, "", "",
"Service",
"If specified, instruct PPPoE to only initiate sessions "
"with access concentrators that provide the specified "
"service. For most providers, this should be left "
"blank. It is only required if there are multiple "
"access concentrators or a specific service is known "
"to be required.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPPOE:username: * NMSettingPPPOE:username:
@@ -317,11 +311,10 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_USERNAME, (object_class, PROP_USERNAME,
g_param_spec_string (NM_SETTING_PPPOE_USERNAME, g_param_spec_string (NM_SETTING_PPPOE_USERNAME, "", "",
"Username",
"Username used to authenticate with the PPPoE service.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPPOE:password: * NMSettingPPPOE:password:
@@ -330,23 +323,22 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PASSWORD, (object_class, PROP_PASSWORD,
g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "",
"Password",
"Password used to authenticate with the PPPoE service.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingPPPOE:password-flags: * NMSettingPPPOE:password-flags:
* *
* Flags indicating how to handle the #NMSettingPPPOE:password property. * Flags indicating how to handle the #NMSettingPPPOE:password property.
**/ **/
g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_PPPOE_PASSWORD_FLAGS, (object_class, PROP_PASSWORD_FLAGS,
"Password Flags", g_param_spec_uint (NM_SETTING_PPPOE_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the PPPoE password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

42
libnm-util/nm-setting-serial.c
View File

@@ -261,14 +261,10 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BAUD, (object_class, PROP_BAUD,
g_param_spec_uint (NM_SETTING_SERIAL_BAUD, g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "",
"Baud",
"Speed to use for communication over the serial port. "
"Note that this value usually has no effect for mobile "
"broadband modems as they generally ignore speed "
"settings and use the highest available speed.",
0, G_MAXUINT, 57600, 0, G_MAXUINT, 57600,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:bits: * NMSettingSerial:bits:
@@ -277,12 +273,10 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BITS, (object_class, PROP_BITS,
g_param_spec_uint (NM_SETTING_SERIAL_BITS, g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "",
"Bits",
"Byte-width of the serial communication. The 8 in "
"'8n1' for example.",
5, 8, 8, 5, 8, 8,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:parity: * NMSettingSerial:parity:
@@ -292,12 +286,10 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PARITY, (object_class, PROP_PARITY,
g_param_spec_char (NM_SETTING_SERIAL_PARITY, g_param_spec_char (NM_SETTING_SERIAL_PARITY, "", "",
"Parity",
"Parity setting of the serial port. Either 'E' for even "
"parity, 'o' for odd parity, or 'n' for no parity.",
'E', 'o', 'n', 'E', 'o', 'n',
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:stopbits: * NMSettingSerial:stopbits:
@@ -307,12 +299,10 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_STOPBITS, (object_class, PROP_STOPBITS,
g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "",
"Stopbits",
"Number of stop bits for communication on the serial "
"port. Either 1 or 2. The 1 in '8n1' for example.",
1, 2, 1, 1, 2, 1,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingSerial:send-delay: * NMSettingSerial:send-delay:
@@ -321,10 +311,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SEND_DELAY, (object_class, PROP_SEND_DELAY,
g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "",
"SendDelay",
"Time to delay between each byte sent to the modem, "
"in microseconds.",
0, G_MAXUINT64, 0, 0, G_MAXUINT64, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
} }

11
libnm-util/nm-setting-team-port.c
View File

@@ -176,13 +176,8 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CONFIG, (object_class, PROP_CONFIG,
g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "",
"Config",
"JSON configuration for the team port. "
"The property should contain raw JSON configuration data "
"suitable for teamd, because the value is passed directly to "
"teamd. If not specified, the dafault configuration is used. "
"See man teamd.conf for the format details.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

18
libnm-util/nm-setting-team.c
View File

@@ -242,11 +242,10 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INTERFACE_NAME, (object_class, PROP_INTERFACE_NAME,
g_param_spec_string (NM_SETTING_TEAM_INTERFACE_NAME, g_param_spec_string (NM_SETTING_TEAM_INTERFACE_NAME, "", "",
"InterfaceName",
"The name of the virtual in-kernel team network interface",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingTeam:config: * NMSettingTeam:config:
@@ -258,13 +257,8 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CONFIG, (object_class, PROP_CONFIG,
g_param_spec_string (NM_SETTING_TEAM_CONFIG, g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "",
"Config",
"JSON configuration for the team network interface. "
"The property should contain raw JSON configuration data "
"suitable for teamd, because the value is passed directly to "
"teamd. If not specified, the default configuration is used. "
"See man teamd.conf for the format details.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

66
libnm-util/nm-setting-vlan.c
View File

@@ -758,17 +758,10 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INTERFACE_NAME, (object_class, PROP_INTERFACE_NAME,
g_param_spec_string (NM_SETTING_VLAN_INTERFACE_NAME, g_param_spec_string (NM_SETTING_VLAN_INTERFACE_NAME, "", "",
"InterfaceName",
"If given, specifies the kernel name of the VLAN "
"interface. If not given, a default name will be "
"constructed from the interface described by the "
"parent interface and the 'id' property, ex "
"'eth2.1'. The parent interface may be given by "
"the 'parent' property or by the 'mac-address' "
"property of a 'wired' setting.",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:parent: * NMSettingVlan:parent:
@@ -780,15 +773,10 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PARENT, (object_class, PROP_PARENT,
g_param_spec_string (NM_SETTING_VLAN_PARENT, g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "",
"Parent",
"If given, specifies the parent interface name or "
"parent connection UUID from which this VLAN "
"interface should be created. If this property is "
"not specified, the connection must contain a "
"'wired' setting with a 'mac-address' property.",
NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:id: * NMSettingVlan:id:
@@ -798,12 +786,10 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_ID, (object_class, PROP_ID,
g_param_spec_uint (NM_SETTING_VLAN_ID, g_param_spec_uint (NM_SETTING_VLAN_ID, "", "",
"VLAN ID",
"The VLAN indentifier the interface created by "
"this connection should be assigned.",
0, 4095, 0, 0, 4095, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:flags: * NMSettingVlan:flags:
@@ -816,16 +802,10 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_FLAGS, (object_class, PROP_FLAGS,
g_param_spec_uint (NM_SETTING_VLAN_FLAGS, g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "",
"VLAN flags",
"One or more flags which control the behavior and "
"features of the VLAN interface. Flags include "
"reordering of output packet headers (0x01), use "
"of the GVRP protocol (0x02), and loose binding "
"of the interface to its master device's operating "
"state (0x04).",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:ingress-priority-map: * NMSettingVlan:ingress-priority-map:
@@ -836,15 +816,10 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_INGRESS_PRIORITY_MAP, (object_class, PROP_INGRESS_PRIORITY_MAP,
_nm_param_spec_specialized (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "",
"VLAN ingress priority mapping",
"For incoming packets, a list of mappings "
"from 802.1p priorities to Linux SKB "
"priorities. The mapping is given in the "
"format 'from:to' where both 'from' and "
"'to' are unsigned integers, ie '7:3'.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVlan:egress-priority-map: * NMSettingVlan:egress-priority-map:
@@ -855,13 +830,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_EGRESS_PRIORITY_MAP, (object_class, PROP_EGRESS_PRIORITY_MAP,
_nm_param_spec_specialized (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "",
"VLAN egress priority mapping",
"For outgoing packets, a list of mappings "
"from Linux SKB priorities to 802.1p "
"priorities. The mapping is given in the "
"format 'from:to' where both 'from' and "
"'to' are unsigned integers, ie '7:3'.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

42
libnm-util/nm-setting-vpn.c
View File

@@ -822,14 +822,10 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SERVICE_TYPE, (object_class, PROP_SERVICE_TYPE,
g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, "", "",
"Service type",
"D-Bus service name of the VPN plugin that this "
"setting uses to connect to its network. i.e. "
"org.freedesktop.NetworkManager.vpnc for the vpnc "
"plugin.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVPN:user-name: * NMSettingVPN:user-name:
@@ -843,18 +839,10 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_USER_NAME, (object_class, PROP_USER_NAME,
g_param_spec_string (NM_SETTING_VPN_USER_NAME, g_param_spec_string (NM_SETTING_VPN_USER_NAME, "", "",
"User name",
"If the VPN connection requires a user name for "
"authentication, that name should be provided here. "
"If the connection is available to more than one "
"user, and the VPN requires each user to supply a "
"different name, then leave this property empty. If "
"this property is empty, NetworkManager will "
"automatically supply the username of the user which "
"requested the VPN connection.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVPN:data: * NMSettingVPN:data:
@@ -864,13 +852,10 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DATA, (object_class, PROP_DATA,
_nm_param_spec_specialized (NM_SETTING_VPN_DATA, _nm_param_spec_specialized (NM_SETTING_VPN_DATA, "", "",
"Data",
"Dictionary of key/value pairs of VPN plugin "
"specific data. Both keys and values must be "
"strings.",
DBUS_TYPE_G_MAP_OF_STRING, DBUS_TYPE_G_MAP_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingVPN:secrets: * NMSettingVPN:secrets:
@@ -880,12 +865,9 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SECRETS, (object_class, PROP_SECRETS,
_nm_param_spec_specialized (NM_SETTING_VPN_SECRETS, _nm_param_spec_specialized (NM_SETTING_VPN_SECRETS, "", "",
"Secrets",
"Dictionary of key/value pairs of VPN plugin "
"specific secrets like passwords or private keys."
" Both keys and values must be strings.",
DBUS_TYPE_G_MAP_OF_STRING, DBUS_TYPE_G_MAP_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
} }

18
libnm-util/nm-setting-wimax.c
View File

@@ -241,12 +241,10 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NETWORK_NAME, (object_class, PROP_NETWORK_NAME,
g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, "", "",
"NetworkName",
"Network Service Provider (NSP) name of the WiMAX "
"network this connection should use.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWimax:mac-address: * NMSettingWimax:mac-address:
@@ -257,12 +255,8 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS, (object_class, PROP_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_WIMAX_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIMAX_MAC_ADDRESS, "", "",
"MAC Address",
"If specified, this connection will only apply to "
"the WiMAX device whose MAC address matches. "
"This property does not change the MAC address "
"of the device (known as MAC spoofing).",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

110
libnm-util/nm-setting-wired.c
View File

@@ -877,16 +877,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PORT, (object_class, PROP_PORT,
g_param_spec_string (NM_SETTING_WIRED_PORT, g_param_spec_string (NM_SETTING_WIRED_PORT, "", "",
"Port",
"Specific port type to use if multiple the device "
"supports multiple attachment methods. One of "
"'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), "
"'bnc' (Thin Ethernet) or 'mii' (Media Independent "
"Interface. If the device supports only one port "
"type, this setting is ignored.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:speed: * NMSettingWired:speed:
@@ -896,12 +890,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SPEED, (object_class, PROP_SPEED,
g_param_spec_uint (NM_SETTING_WIRED_SPEED, g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "",
"Speed",
"If non-zero, request that the device use only the "
"specified speed. In Mbit/s, ie 100 == 100Mbit/s.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:duplex: * NMSettingWired:duplex:
@@ -911,12 +903,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_DUPLEX, (object_class, PROP_DUPLEX,
g_param_spec_string (NM_SETTING_WIRED_DUPLEX, g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "",
"Duplex",
"If specified, request that the device only use the "
"specified duplex mode. Either 'half' or 'full'.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:auto-negotiate: * NMSettingWired:auto-negotiate:
@@ -927,14 +917,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_AUTO_NEGOTIATE, (object_class, PROP_AUTO_NEGOTIATE,
g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "",
"AutoNegotiate",
"If TRUE, allow auto-negotiation of port speed and "
"duplex mode. If FALSE, do not allow auto-negotiation,"
"in which case the 'speed' and 'duplex' properties "
"should be set.",
TRUE, TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:mac-address: * NMSettingWired:mac-address:
@@ -945,14 +931,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS, (object_class, PROP_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, "", "",
"Device MAC Address",
"If specified, this connection will only apply to "
"the Ethernet device whose permanent MAC address matches. "
"This property does not change the MAC address "
"of the device (i.e. MAC spoofing).",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:cloned-mac-address: * NMSettingWired:cloned-mac-address:
@@ -962,13 +944,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CLONED_MAC_ADDRESS, (object_class, PROP_CLONED_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "",
"Cloned MAC Address",
"If specified, request that the device use "
"this MAC address instead of its permanent MAC address. "
"This is known as MAC cloning or spoofing.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:mac-address-blacklist: * NMSettingWired:mac-address-blacklist:
@@ -980,14 +959,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS_BLACKLIST, (object_class, PROP_MAC_ADDRESS_BLACKLIST,
_nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "",
"MAC Address Blacklist",
"If specified, this connection will never apply to "
"the Ethernet device whose permanent MAC address matches "
"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, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:mtu: * NMSettingWired:mtu:
@@ -997,13 +972,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MTU, (object_class, PROP_MTU,
g_param_spec_uint (NM_SETTING_WIRED_MTU, g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "",
"MTU",
"If non-zero, only transmit packets of the specified "
"size or smaller, breaking larger packets up into "
"multiple Ethernet frames.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-subchannels: * NMSettingWired:s390-subchannels:
@@ -1018,19 +990,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_S390_SUBCHANNELS, (object_class, PROP_S390_SUBCHANNELS,
_nm_param_spec_specialized (NM_SETTING_WIRED_S390_SUBCHANNELS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "",
"z/VM Subchannels",
"Identifies specific subchannels that this "
"network device uses for communcation with z/VM "
"or s390 host. Like the 'mac-address' property "
"for non-z/VM devices, this property can be used "
"to ensure this connection only applies to the "
"network device that uses these subchannels. The "
"list should contain exactly 3 strings, and each "
"string may only be composed of hexadecimal "
"characters and the period (.) character.",
DBUS_TYPE_G_ARRAY_OF_STRING, DBUS_TYPE_G_ARRAY_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-nettype: * NMSettingWired:s390-nettype:
@@ -1040,13 +1003,10 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_S390_NETTYPE, (object_class, PROP_S390_NETTYPE,
g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "",
"s390 Net Type",
"s390 network device type; one of 'qeth', 'lcs', or "
"'ctc', representing the different types of virtual "
"network devices available on s390 systems.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWired:s390-options: * NMSettingWired:s390-options:
@@ -1058,13 +1018,9 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_S390_OPTIONS, (object_class, PROP_S390_OPTIONS,
_nm_param_spec_specialized (NM_SETTING_WIRED_S390_OPTIONS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_OPTIONS, "", "",
"s390 Options",
"Dictionary of key/value pairs of s390-specific "
"device options. Both keys and values must be "
"strings. Allowed keys include 'portno', "
"'layer2', 'portname', 'protocol', among others.",
DBUS_TYPE_G_MAP_OF_STRING, DBUS_TYPE_G_MAP_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE)); G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
} }

180
libnm-util/nm-setting-wireless-security.c
View File

@@ -1355,15 +1355,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_KEY_MGMT, (object_class, PROP_KEY_MGMT,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "",
"Key management",
"Key management used for the connection. One of "
"'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' "
"(WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), "
"or 'wpa-eap' (WPA-Enterprise). This property must "
"be set for any Wi-Fi connection that uses security.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED)); G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-tx-keyidx: * NMSettingWirelessSecurity:wep-tx-keyidx:
@@ -1375,15 +1370,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_TX_KEYIDX, (object_class, PROP_WEP_TX_KEYIDX,
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "",
"WEP TX key index",
"When static WEP is used (ie, key-mgmt = 'none') and a "
"non-default WEP key index is used by the AP, put that "
"WEP key index here. Valid values are 0 (default key) "
"through 3. Note that some consumer access points "
"(like the Linksys WRT54G) number the keys 1 - 4.",
0, 3, 0, 0, 3, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:auth-alg: * NMSettingWirelessSecurity:auth-alg:
@@ -1396,17 +1386,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_AUTH_ALG, (object_class, PROP_AUTH_ALG,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "",
"AuthAlg",
"When WEP is used (ie, key-mgmt = 'none' or "
"'ieee8021x') indicate the 802.11 authentication "
"algorithm required by the AP here. One of 'open' for "
"Open System, 'shared' for Shared Key, or 'leap' for "
"Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = "
"'ieee8021x' and auth-alg = 'leap') the 'leap-username' "
"and 'leap-password' properties must be specified.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:proto: * NMSettingWirelessSecurity:proto:
@@ -1417,15 +1400,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PROTO, (object_class, PROP_PROTO,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "",
"Proto",
"List of strings specifying the allowed WPA "
"protocol versions to use. Each element may be "
"one 'wpa' (allow WPA) or 'rsn' (allow "
"WPA2/RSN). If not specified, both WPA and RSN "
"connections are allowed.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:pairwise: * NMSettingWirelessSecurity:pairwise:
@@ -1437,16 +1415,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PAIRWISE, (object_class, PROP_PAIRWISE,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "",
"Pairwise",
"A list of pairwise encryption algorithms which "
"prevents connections to Wi-Fi networks that do "
"not utilize one of the algorithms in the list. "
"For maximum compatibility leave this property "
"empty. Each list element may be one of 'tkip' "
"or 'ccmp'.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:group: * NMSettingWirelessSecurity:group:
@@ -1458,16 +1430,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_GROUP, (object_class, PROP_GROUP,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "",
"Group",
"A list of group/broadcast encryption algorithms "
"which prevents connections to Wi-Fi networks "
"that do not utilize one of the algorithms in "
"the list. For maximum compatibility leave this "
"property empty. Each list element may be one "
" of 'wep40', 'wep104', 'tkip', or 'ccmp'.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-username: * NMSettingWirelessSecurity:leap-username:
@@ -1477,12 +1443,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_LEAP_USERNAME, (object_class, PROP_LEAP_USERNAME,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "",
"LEAP Username",
"The login username for legacy LEAP connections "
"(ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key0: * NMSettingWirelessSecurity:wep-key0:
@@ -1492,13 +1456,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_KEY0, (object_class, PROP_WEP_KEY0,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "",
"WEP key0",
"Index 0 WEP key. This is the WEP key used in most "
"networks. See the 'wep-key-type' property for a "
"description of how this key is interpreted.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key1: * NMSettingWirelessSecurity:wep-key1:
@@ -1508,13 +1469,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_KEY1, (object_class, PROP_WEP_KEY1,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "",
"WEP key1",
"Index 1 WEP key. This WEP index is not used by most "
"networks. See the 'wep-key-type' property for a "
"description of how this key is interpreted.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key2: * NMSettingWirelessSecurity:wep-key2:
@@ -1524,13 +1482,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_KEY2, (object_class, PROP_WEP_KEY2,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "",
"WEP key2",
"Index 2 WEP key. This WEP index is not used by most "
"networks. See the 'wep-key-type' property for a "
"description of how this key is interpreted.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key3: * NMSettingWirelessSecurity:wep-key3:
@@ -1540,13 +1495,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_KEY3, (object_class, PROP_WEP_KEY3,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "",
"WEP key3",
"Index 3 WEP key. This WEP index is not used by most "
"networks. See the 'wep-key-type' property for a "
"description of how this key is interpreted.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key-flags: * NMSettingWirelessSecurity:wep-key-flags:
@@ -1555,14 +1507,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
* #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2, * #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2,
* and #NMSettingWirelessSecurity:wep-key3 properties. * and #NMSettingWirelessSecurity:wep-key3 properties.
**/ **/
g_object_class_install_property (object_class, PROP_WEP_KEY_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, (object_class, PROP_WEP_KEY_FLAGS,
"WEP Key Flags", g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "",
"Flags indicating how to handle the WEP keys.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:psk: * NMSettingWirelessSecurity:psk:
@@ -1576,18 +1528,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PSK, (object_class, PROP_PSK,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "",
"PSK",
"Pre-Shared-Key for WPA networks. If the key is "
"64-characters long, it must contain only hexadecimal "
"characters and is interpreted as a hexadecimal WPA "
"key. Otherwise, the key must be between 8 and 63 "
"ASCII characters (as specified in the 802.11i standard) "
"and is interpreted as a WPA passphrase, and is hashed "
"to derive the actual WPA-PSK used when connecting to "
"the Wi-Fi network.",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:psk-flags: * NMSettingWirelessSecurity:psk-flags:
@@ -1595,14 +1539,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
* Flags indicating how to handle the #NMSettingWirelessSecurity:psk * Flags indicating how to handle the #NMSettingWirelessSecurity:psk
* property. * property.
**/ **/
g_object_class_install_property (object_class, PROP_PSK_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, (object_class, PROP_PSK_FLAGS,
"PSK Flags", g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "",
"Flags indicating how to handle the WPA PSK key.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-password: * NMSettingWirelessSecurity:leap-password:
@@ -1612,12 +1556,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_LEAP_PASSWORD, (object_class, PROP_LEAP_PASSWORD,
g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "",
"LEAP Password",
"The login password for legacy LEAP connections "
"(ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:leap-password-flags: * NMSettingWirelessSecurity:leap-password-flags:
@@ -1625,14 +1567,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
* Flags indicating how to handle the * Flags indicating how to handle the
* #NMSettingWirelessSecurity:leap-password property. * #NMSettingWirelessSecurity:leap-password property.
**/ **/
g_object_class_install_property (object_class, PROP_LEAP_PASSWORD_FLAGS, g_object_class_install_property
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, (object_class, PROP_LEAP_PASSWORD_FLAGS,
"LEAP Password Flags", g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "",
"Flags indicating how to handle the LEAP password.",
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
NM_SETTING_SECRET_FLAGS_ALL, NM_SETTING_SECRET_FLAGS_ALL,
NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_SECRET_FLAG_NONE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWirelessSecurity:wep-key-type: * NMSettingWirelessSecurity:wep-key-type:
@@ -1646,18 +1588,10 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_WEP_KEY_TYPE, (object_class, PROP_WEP_KEY_TYPE,
g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "",
"WEP Key Type",
"Controls the interpretation of WEP keys. Allowed values "
"are 1 (interpret WEP keys as hexadecimal or ASCII keys) "
"or 2 (interpret WEP keys as WEP Passphrases). If set to "
"1 and the keys are hexadecimal, they must be either 10 or "
"26 characters in length. If set to 1 and the keys are "
"ASCII keys, they must be either 5 or 13 characters in "
"length. If set to 2, the passphrase is hashed using "
" the de-facto MD5 method to derive the actual WEP key.",
NM_WEP_KEY_TYPE_UNKNOWN, NM_WEP_KEY_TYPE_UNKNOWN,
NM_WEP_KEY_TYPE_LAST, NM_WEP_KEY_TYPE_LAST,
NM_WEP_KEY_TYPE_UNKNOWN, NM_WEP_KEY_TYPE_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
} }

150
libnm-util/nm-setting-wireless.c
View File

@@ -1037,11 +1037,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SSID, (object_class, PROP_SSID,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID, "", "",
"SSID",
"SSID of the Wi-Fi network. Must be specified.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mode: * NMSettingWireless:mode:
@@ -1051,12 +1050,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MODE, (object_class, PROP_MODE,
g_param_spec_string (NM_SETTING_WIRELESS_MODE, g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "",
"Mode",
"Wi-Fi network mode; one of 'infrastructure', "
"'adhoc' or 'ap'. If blank, infrastructure is assumed.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:band: * NMSettingWireless:band:
@@ -1070,18 +1067,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BAND, (object_class, PROP_BAND,
g_param_spec_string (NM_SETTING_WIRELESS_BAND, g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "",
"Band",
"802.11 frequency band of the network. One of 'a' "
"for 5GHz 802.11a or 'bg' for 2.4GHz 802.11. This "
"will lock associations to the Wi-Fi network to the "
"specific band, i.e. if 'a' is specified, the device "
"will not associate with the same network in the "
"2.4GHz band even if the network's settings are "
"compatible. This setting depends on specific driver "
"capability and may not work with all drivers.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:channel: * NMSettingWireless:channel:
@@ -1093,15 +1082,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CHANNEL, (object_class, PROP_CHANNEL,
g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "",
"Channel",
"Wireless channel to use for the Wi-Fi connection. The "
"device will only join (or create for Ad-Hoc networks) "
"a Wi-Fi network on the specified channel. Because "
"channel numbers overlap between bands, this property "
"also requires the 'band' property to be set.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:bssid: * NMSettingWireless:bssid:
@@ -1113,16 +1097,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_BSSID, (object_class, PROP_BSSID,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID, _nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID, "", "",
"BSSID",
"If specified, directs the device to only associate "
"with the given access point. This capability is "
"highly driver dependent and not supported by all "
"devices. Note: this property does not control "
"the BSSID used when creating an Ad-Hoc network "
"and is unlikely to in the future.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:rate: * NMSettingWireless:rate:
@@ -1134,15 +1112,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_RATE, (object_class, PROP_RATE,
g_param_spec_uint (NM_SETTING_WIRELESS_RATE, g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "",
"Rate",
"If non-zero, directs the device to only use the "
"specified bitrate for communication with the access "
"point. Units are in Kb/s, ie 5500 = 5.5 Mbit/s. This "
"property is highly driver dependent and not all devices "
"support setting a static bitrate.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:tx-power: * NMSettingWireless:tx-power:
@@ -1153,14 +1126,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_TX_POWER, (object_class, PROP_TX_POWER,
g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "",
"TX Power",
"If non-zero, directs the device to use the specified "
"transmit power. Units are dBm. This property is highly "
"driver dependent and not all devices support setting a "
"static transmit power.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mac-address: * NMSettingWireless:mac-address:
@@ -1171,14 +1140,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS, (object_class, PROP_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "",
"Device MAC Address",
"If specified, this connection will only apply to "
"the Wi-Fi device whose permanent MAC address matches. "
"This property does not change the MAC address "
"of the device (i.e. MAC spoofing).",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:cloned-mac-address: * NMSettingWireless:cloned-mac-address:
@@ -1188,13 +1153,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_CLONED_MAC_ADDRESS, (object_class, PROP_CLONED_MAC_ADDRESS,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "",
"Spoof MAC Address",
"If specified, request that the Wi-Fi device use "
"this MAC address instead of its permanent MAC address. "
"This is known as MAC cloning or spoofing.",
DBUS_TYPE_G_UCHAR_ARRAY, DBUS_TYPE_G_UCHAR_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mac-address-blacklist: * NMSettingWireless:mac-address-blacklist:
@@ -1205,15 +1167,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MAC_ADDRESS_BLACKLIST, (object_class, PROP_MAC_ADDRESS_BLACKLIST,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "",
"MAC Address Blacklist",
"A list of permanent MAC addresses of Wi-Fi "
"devices to which this connection should "
"never apply. Each MAC address should be "
"given in the standard hex-digits-and-colons "
"notation (eg '00:11:22:33:44:55').",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:seen-bssids: * NMSettingWireless:seen-bssids:
@@ -1227,18 +1184,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SEEN_BSSIDS, (object_class, PROP_SEEN_BSSIDS,
_nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "",
"Seen BSSIDS",
"A list of BSSIDs (each BSSID formatted as a MAC "
"address like 00:11:22:33:44:55') that have been "
"detected as part of the Wi-Fi network. "
"NetworkManager internally tracks previously seen "
"BSSIDs. The property is only meant for reading "
"and reflects the BSSID list of NetworkManager. "
"The changes you make to this property will not be "
"preserved.",
DBUS_TYPE_G_LIST_OF_STRING, DBUS_TYPE_G_LIST_OF_STRING,
G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:mtu: * NMSettingWireless:mtu:
@@ -1248,13 +1197,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_MTU, (object_class, PROP_MTU,
g_param_spec_uint (NM_SETTING_WIRELESS_MTU, g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "",
"MTU",
"If non-zero, only transmit packets of the specified "
"size or smaller, breaking larger packets up into "
"multiple Ethernet frames.",
0, G_MAXUINT32, 0, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:security: * NMSettingWireless:security:
@@ -1270,15 +1216,10 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SEC, (object_class, PROP_SEC,
g_param_spec_string (NM_SETTING_WIRELESS_SEC, g_param_spec_string (NM_SETTING_WIRELESS_SEC, "", "",
"Security",
"If the wireless connection has any security "
"restrictions, like 802.1x, WEP, or WPA, set this "
"property to '" NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "' "
"and ensure the connection contains a valid "
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME " setting.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/** /**
* NMSettingWireless:hidden: * NMSettingWireless:hidden:
@@ -1291,15 +1232,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_HIDDEN, (object_class, PROP_HIDDEN,
g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "",
"Hidden",
"If TRUE, indicates this network is a non-broadcasting "
"network that hides its SSID. In this case various "
"workarounds may take place, such as probe-scanning "
"the SSID for more reliable network discovery. "
"However, these workarounds expose inherent "
"insecurities with hidden SSID networks, and thus "
"hidden SSID networks should be used with caution.",
FALSE, FALSE,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }

10
libnm-util/nm-setting.c
View File

@@ -1348,13 +1348,9 @@ nm_setting_class_init (NMSettingClass *setting_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NAME, (object_class, PROP_NAME,
g_param_spec_string (NM_SETTING_NAME, g_param_spec_string (NM_SETTING_NAME, "", "",
"Name",
"The setting's name; these names are defined by the "
"specification and cannot be changed after the object "
"has been created. Each setting class has a name, and "
"all objects of that class share the same name.",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
} }