Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 67 insertions, 6 deletions

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 59c89182..b14b4721 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -495,6 +495,14 @@
 </tr>
 <tr>
 <td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIP4Config.html#nm-setting-ip4-config-get-dhcp-timeout" title="nm_setting_ip4_config_get_dhcp_timeout ()">nm_setting_ip4_config_get_dhcp_timeout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
@@ -545,6 +553,11 @@
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
 <tr>
+<td class="property_type"><span class="type">guint</span></td>
+<td class="property_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-timeout" title="The “dhcp-timeout” property">dhcp-timeout</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type">
 <span class="type">GArray_guint_</span> *</td>
 <td class="property_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dns" title="The “dns” property">dns</a></td>
@@ -662,6 +675,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-DHCP-TIMEOUT:CAPS" title="NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT">NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-NEVER-DEFAULT:CAPS" title="NM_SETTING_IP4_CONFIG_NEVER_DEFAULT">NM_SETTING_IP4_CONFIG_NEVER_DEFAULT</a></td>
 </tr>
 <tr>
@@ -693,10 +710,10 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingIP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    GBoxed
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">├──</span> NMIP4Address
     <span class="lineart">╰──</span> NMIP4Route
-    GEnum
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
     <span class="lineart">╰──</span> NMSettingIP4ConfigError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -2315,6 +2332,35 @@ property.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-ip4-config-get-dhcp-timeout"></a><h3>nm_setting_ip4_config_get_dhcp_timeout ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_setting_ip4_config_get_dhcp_timeout
+                               (<em class="parameter"><code><a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> *setting</code></em>);</pre>
+<p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-timeout" title="The “dhcp-timeout” property"><span class="type">“dhcp-timeout”</span></a>
+property.</p>
+<div class="refsect3">
+<a name="id-1.2.25.11.59.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.25.11.59.6"></a><h4>Returns</h4>
+<p> The number of seconds after which unfinished DHCP transaction
+fails or zero for "default".</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-ip4-config-get-never-default"></a><h3>nm_setting_ip4_config_get_never_default ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_setting_ip4_config_get_never_default
@@ -2322,7 +2368,7 @@ nm_setting_ip4_config_get_never_default
 <p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--never-default" title="The “never-default” property"><span class="type">“never-default”</span></a>
 property.</p>
 <div class="refsect3">
-<a name="id-1.2.25.11.59.5"></a><h4>Parameters</h4>
+<a name="id-1.2.25.11.60.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2337,7 +2383,7 @@ property.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.25.11.59.6"></a><h4>Returns</h4>
+<a name="id-1.2.25.11.60.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection should never be the default connection
 for IPv4 addressing</p>
 </div>
@@ -2350,7 +2396,7 @@ nm_setting_ip4_config_get_may_fail (<em class="parameter"><code><a class="link"
 <p>Returns the value contained in the <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--may-fail" title="The “may-fail” property"><span class="type">“may-fail”</span></a>
 property.</p>
 <div class="refsect3">
-<a name="id-1.2.25.11.60.5"></a><h4>Parameters</h4>
+<a name="id-1.2.25.11.61.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2365,7 +2411,7 @@ property.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.2.25.11.60.6"></a><h4>Returns</h4>
+<a name="id-1.2.25.11.61.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.</p>
 </div>
@@ -2498,6 +2544,12 @@ not valid with the given IP4 method</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-IP4-CONFIG-DHCP-TIMEOUT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT</h3>
+<pre class="programlisting">#define NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT       "dhcp-timeout"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-IP4-CONFIG-NEVER-DEFAULT:CAPS"></a><h3>NM_SETTING_IP4_CONFIG_NEVER_DEFAULT</h3>
 <pre class="programlisting">#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 </pre>
@@ -2600,6 +2652,15 @@ providing a static hostname for the computer.  If the
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingIP4Config--dhcp-timeout"></a><h3>The <code class="literal">“dhcp-timeout”</code> property</h3>
+<pre class="programlisting">  “dhcp-timeout”             <span class="type">guint</span></pre>
+<p>Number of seconds after which the unfinished DHCP transaction fails
+or zero for default.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: 0</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingIP4Config--dns"></a><h3>The <code class="literal">“dns”</code> property</h3>
 <pre class="programlisting">  “dns”                      <span class="type">GArray_guint_</span> *</pre>
 <p>List of DNS servers (network byte order).  For the "auto" method, these