Imported Upstream version 1.2.2 upstream/1.2.2

1 files changed, 23 insertions, 7 deletions

diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index dee83c75..4015e5b6 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceBridge.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceBridge.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBridge.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBridge.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceBridge.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -115,6 +116,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceBridge.html#NM-DEVICE-BRIDGE-SLAVES:CAPS" title="NM_DEVICE_BRIDGE_SLAVES">NM_DEVICE_BRIDGE_SLAVES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceBridge.html#NMDeviceBridge-struct" title="NMDeviceBridge">NMDeviceBridge</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -127,6 +132,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBridge.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceBridge implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBridge.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -137,7 +148,7 @@
 nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.5.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -152,7 +163,7 @@ nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -164,7 +175,7 @@ device, and must not be modified.</p>
 nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.5.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -179,7 +190,7 @@ nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -191,7 +202,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 <p>Gets the devices currently slaved to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.5.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -206,7 +217,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing
 <a href="NMDevice.html"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
@@ -234,6 +245,11 @@ copy used by the device, and must not be modified. </p>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBridge-struct"></a><h3>NMDeviceBridge</h3>
+<pre class="programlisting">typedef struct _NMDeviceBridge NMDeviceBridge;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.property-details"></a><h2>Property Details</h2>