summaryrefslogtreecommitdiff
path: root/libnm-util/nm-setting-ip6-config.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-06-05 16:23:32 -0400
committerDan Winship <danw@gnome.org>2014-06-19 17:45:03 -0400
commitcdc15cb2a6312ab5e6da4618d97e003dce32c1e9 (patch)
treea92ab1ac6917ceedccb7bd8a3405afe4cffde377 /libnm-util/nm-setting-ip6-config.c
parent8252ebd941d17fff932023d29aac0bfe436d4bf9 (diff)
downloadNetworkManager-cdc15cb2a6312ab5e6da4618d97e003dce32c1e9.tar.gz
libnm-util: remove NMSetting* GParamSpec docs
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.
Diffstat (limited to 'libnm-util/nm-setting-ip6-config.c')
-rw-r--r--libnm-util/nm-setting-ip6-config.c173
1 files changed, 42 insertions, 131 deletions
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index b027ee96a9..708e7b857d 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -1032,24 +1032,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE));
+ g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD, "", "",
+ NULL,
+ G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:dhcp-hostname:
@@ -1061,12 +1047,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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.",
+ g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, "", "",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:dns:
@@ -1081,20 +1065,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE));
+ _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, "", "",
+ DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:dns-search:
@@ -1107,18 +1081,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE));
+ _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH, "", "",
+ DBUS_TYPE_G_LIST_OF_STRING,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:addresses:
@@ -1136,25 +1102,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE));
+ _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, "", "",
+ DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS,
+ G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:routes:
@@ -1170,22 +1121,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE));
+ _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, "", "",
+ DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE,
+ G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:ignore-auto-routes:
@@ -1196,14 +1135,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, "", "",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:ignore-auto-dns:
@@ -1216,15 +1151,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, "", "",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:never-default:
@@ -1235,13 +1165,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ g_param_spec_boolean (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, "", "",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:may-fail:
@@ -1255,18 +1182,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, "", "",
+ TRUE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+ G_PARAM_STATIC_STRINGS));
/**
* NMSettingIP6Config:ip6-privacy:
@@ -1281,20 +1200,12 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
**/
g_object_class_install_property
(object_class, PROP_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).",
+ g_param_spec_int (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+ G_PARAM_STATIC_STRINGS));
}
/********************************************************************/