From 8d275584fc94f398f0a7c990dcd057533d9a5856 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Feb 2013 23:06:45 +0100
Subject: Imported Upstream version 0.9.8.0

---
 libnm-util/nm-setting-bridge.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'libnm-util/nm-setting-bridge.c')

diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index 3363ffd4..c6b3f299 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -40,6 +40,8 @@
  *
  * The #NMSettingBridge object is a #NMSetting subclass that describes properties
  * necessary for bridging connections.
+ *
+ * Since: 0.9.8
  **/
 
 /**
@@ -48,6 +50,8 @@
  * Registers an error quark for #NMSettingBridge if necessary.
  *
  * Returns: the error quark used for #NMSettingBridge errors.
+ *
+ * Since: 0.9.8
  **/
 GQuark
 nm_setting_bridge_error_quark (void)
@@ -97,6 +101,8 @@ enum {
  * Creates a new #NMSettingBridge object with default values.
  *
  * Returns: (transfer full): the new empty #NMSettingBridge object
+ *
+ * Since: 0.9.8
  **/
 NMSetting *
 nm_setting_bridge_new (void)
@@ -109,6 +115,8 @@ nm_setting_bridge_new (void)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:interface-name property of the setting
+ *
+ * Since: 0.9.8
  **/
 const char *
 nm_setting_bridge_get_interface_name (NMSettingBridge *setting)
@@ -123,6 +131,8 @@ nm_setting_bridge_get_interface_name (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:stp property of the setting
+ *
+ * Since: 0.9.8
  **/
 gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting)
@@ -137,6 +147,8 @@ nm_setting_bridge_get_stp (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:priority property of the setting
+ *
+ * Since: 0.9.8
  **/
 guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting)
@@ -151,6 +163,8 @@ nm_setting_bridge_get_priority (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:forward-delay property of the setting
+ *
+ * Since: 0.9.8
  **/
 guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting)
@@ -165,6 +179,8 @@ nm_setting_bridge_get_forward_delay (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:hello-time property of the setting
+ *
+ * Since: 0.9.8
  **/
 guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting)
@@ -179,6 +195,8 @@ nm_setting_bridge_get_hello_time (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:max-age property of the setting
+ *
+ * Since: 0.9.8
  **/
 guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting)
@@ -193,6 +211,8 @@ nm_setting_bridge_get_max_age (NMSettingBridge *setting)
  * @setting: the #NMSettingBridge
  *
  * Returns: the #NMSettingBridge:ageing-time property of the setting
+ *
+ * Since: 0.9.8
  **/
 guint
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting)
@@ -399,6 +419,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:interface-name:
 	 *
 	 * The name of the virtual in-kernel briding network interface
+	 *
+	 * Since: 0.9.8
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_INTERFACE_NAME,
@@ -412,6 +434,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:stp:
 	 *
 	 * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_STP,
@@ -428,6 +452,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
 	 * values are "better"; the lowest priority bridge will be elected the root
 	 * bridge.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_PRIORITY,
@@ -444,6 +470,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:forward-delay:
 	 *
 	 * The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_FORWARD_DELAY,
@@ -458,6 +486,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:hello-time:
 	 *
 	 * The Spanning Tree Protocol (STP) hello time, in seconds.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_HELLO_TIME,
@@ -472,6 +502,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:max-age:
 	 *
 	 * The Spanning Tree Protocol (STP) maximum message age, in seconds.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_MAX_AGE,
@@ -486,6 +518,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 	 * NMSettingBridge:ageing-time:
 	 *
 	 * The ethernet MAC address aging time, in seconds.
+	 *
+	 * Since: 0.9.8
 	 **/
 	 g_object_class_install_property
 		 (object_class, PROP_AGEING_TIME,
-- 
cgit 1.3.0-6-gf8a5