summaryrefslogtreecommitdiff
path: root/libnm-core/nm-setting-vlan.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-11-16 15:36:18 -0500
committerDan Winship <danw@redhat.com>2014-11-19 09:24:10 -0500
commit36156b70dc06fb235ee91f3f58942c64583fa7ca (patch)
tree2accc58666cb9655ab1f02d9483e03ef374ddc05 /libnm-core/nm-setting-vlan.c
parent780d8bf2fe5ce6c2d391a87f99691e4d7db03104 (diff)
downloadNetworkManager-36156b70dc06fb235ee91f3f58942c64583fa7ca.tar.gz
libnm: Override parts of nm-setting-docs.xml
Add "---dbus---" sections to the NMSetting property docs, in the same style as the plugin docs, parse them out into a file "nm-setting-docs-overrides.xml", and use them to override the GObject property docs in nm-setting-docs.xml. This lets us put more D-Bus-specific information in the setting docs, without cluttering up the property docs, and it also lets us document dbus-only properties.
Diffstat (limited to 'libnm-core/nm-setting-vlan.c')
-rw-r--r--libnm-core/nm-setting-vlan.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 5a348211e9..7b7ad91cf6 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -806,6 +806,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
* but VLAN id from DEVICE takes precedence over VLAN_ID.
* example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12
* ---end---
+ * ---dbus---
+ * property: interface-name
+ * format: string
+ * description: Deprecated in favor of connection.interface-name, but can
+ * be used for backward-compatibility with older daemons, to set the
+ * vlan's interface name.
+ * ---end---
*/
_nm_setting_class_add_dbus_only_property (parent_class, "interface-name",
G_VARIANT_TYPE_STRING,