Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 65 insertions, 1 deletions

diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 42178a20..2bbb36e2 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -117,6 +117,13 @@
 </td>
 </tr>
 <tr>
+<td class="function_type">struct <a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">_NMDevice</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMActiveConnection.html#nm-active-connection-get-controller" title="nm_active_connection_get_controller ()">nm_active_connection_get_controller</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
 <td class="function_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
@@ -191,6 +198,12 @@
 <td class="property_flags">Read</td>
 </tr>
 <tr>
+<td class="property_type">
+<a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</td>
+<td class="property_name"><a class="link" href="NMActiveConnection.html#NMActiveConnection--controller" title="The “controller” property">controller</a></td>
+<td class="property_flags">Read</td>
+</tr>
+<tr>
 <td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
 <td class="property_name"><a class="link" href="NMActiveConnection.html#NMActiveConnection--default" title="The “default” property">default</a></td>
 <td class="property_flags">Read</td>
@@ -366,6 +379,10 @@
 <td class="function_name"><a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-MASTER:CAPS" title="NM_ACTIVE_CONNECTION_MASTER">NM_ACTIVE_CONNECTION_MASTER</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-CONTROLLER:CAPS" title="NM_ACTIVE_CONNECTION_CONTROLLER">NM_ACTIVE_CONNECTION_CONTROLLER</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a></td>
 </tr>
@@ -643,6 +660,7 @@ nm_active_connection_get_state_reason (<em class="parameter"><code><a class="lin
 <pre class="programlisting">struct <a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">_NMDevice</span></a> *
 nm_active_connection_get_master (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
+<p>This is replaced by <a class="link" href="NMActiveConnection.html#nm-active-connection-get-controller" title="nm_active_connection_get_controller ()"><code class="function">nm_active_connection_get_controller()</code></a> since 1.44 and 1.42.2.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-master.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -666,6 +684,35 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-active-connection-get-controller"></a><h3>nm_active_connection_get_controller ()</h3>
+<pre class="programlisting">struct <a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">_NMDevice</span></a> *
+nm_active_connection_get_controller (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
+<p>Gets the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection. This replaces the
+deprecated <a class="link" href="NMActiveConnection.html#nm-active-connection-get-master" title="nm_active_connection_get_master ()"><code class="function">nm_active_connection_get_master()</code></a> method.</p>
+<div class="refsect3">
+<a name="nm-active-connection-get-controller.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" 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>connection</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-active-connection-get-controller.returns"></a><h4>Returns</h4>
+<p>the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
+<p><span class="annotation">[<acronym title="The data is owned by the callee, which is responsible of freeing it."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.44, 1.42.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-active-connection-get-default"></a><h3>nm_active_connection_get_default ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_active_connection_get_default (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
@@ -960,6 +1007,12 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-ACTIVE-CONNECTION-CONTROLLER:CAPS"></a><h3>NM_ACTIVE_CONNECTION_CONTROLLER</h3>
+<pre class="programlisting">#define NM_ACTIVE_CONNECTION_CONTROLLER           "controller"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMActiveConnection-struct"></a><h3>NMActiveConnection</h3>
 <pre class="programlisting">typedef struct _NMActiveConnection NMActiveConnection;</pre>
 </div>
@@ -975,6 +1028,16 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMActiveConnection--controller"></a><h3>The <code class="literal">“controller”</code> property</h3>
+<pre class="programlisting">  “controller”               <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
+<p>The controller device if one exists. This replaces the deprecated
+"master" property.</p>
+<p>Owner: NMActiveConnection</p>
+<p>Flags: Read</p>
+<p class="since">Since: 1.44, 1.42.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMActiveConnection--default"></a><h3>The <code class="literal">“default”</code> property</h3>
 <pre class="programlisting">  “default”                  <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
 <p>Whether the active connection is the default IPv4 one.</p>
@@ -1045,7 +1108,8 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p>The master device if one exists.</p>
+<p>The master device if one exists. Replaced by the "controller" property
+since 1.44 and 1.42.2.</p>
 <p>Owner: NMActiveConnection</p>
 <p>Flags: Read</p>
 </div>