Imported Upstream version 1.1.93 upstream/1.1.93

1 files changed, 68 insertions, 34 deletions

diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 4322caee..0dae564f 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -250,6 +250,10 @@
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a></td>
 </tr>
 <tr>
@@ -358,7 +362,8 @@
     <span class="lineart">├──</span> NMDeviceType
     <span class="lineart">├──</span> NMIPTunnelMode
     <span class="lineart">├──</span> NMMetered
-    <span class="lineart">╰──</span> NMState
+    <span class="lineart">├──</span> NMState
+    <span class="lineart">╰──</span> NMWimaxNspNetworkType
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
     <span class="lineart">├──</span> NM80211ApFlags
     <span class="lineart">├──</span> NM80211ApSecurityFlags
@@ -633,9 +638,8 @@
 <div class="refsect2">
 <a name="NMState"></a><h3>enum NMState</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState"><span class="type">NMState</span></a> values indicate the current overall networking state.</p>
-<p>(Corresponds to the NM_STATE type in nm-manager.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.44.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.44.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -706,9 +710,8 @@
 <hr>
 <div class="refsect2">
 <a name="NMConnectivityState"></a><h3>enum NMConnectivityState</h3>
-<p>(Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.45.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.45.3"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -763,9 +766,8 @@
 <a name="NMDeviceType"></a><h3>enum NMDeviceType</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by
 an <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
-<p>(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.46.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.46.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -929,9 +931,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NMDeviceCapabilities"></a><h3>enum NMDeviceCapabilities</h3>
 <p>General device capability flags.</p>
-<p>(Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.47.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.47.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -975,9 +976,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NMDeviceWifiCapabilities"></a><h3>enum NMDeviceWifiCapabilities</h3>
 <p>802.11 specific device encryption and authentication capabilities.</p>
-<p>(Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.48.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.48.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1077,9 +1077,8 @@ GSM/UMTS, or LTE network access protocols</p>
 <div class="refsect2">
 <a name="NM80211ApFlags"></a><h3>enum NM80211ApFlags</h3>
 <p>802.11 access point flags.</p>
-<p>(Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.49.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.49.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1112,9 +1111,8 @@ encryption (usually means WEP)</p>
 <p>802.11 access point security and authentication flags.  These flags describe
 the current security requirements of an access point as determined from the
 access point's beacon.</p>
-<p>(Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.50.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.50.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1214,9 +1212,8 @@ is supported</p>
 <div class="refsect2">
 <a name="NM80211Mode"></a><h3>enum NM80211Mode</h3>
 <p>Indicates the 802.11 mode an access point or device is currently in.</p>
-<p>(Corresponds to the NM_802_11_MODE type in generic-types.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.51.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.51.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1267,9 +1264,8 @@ is supported</p>
 <a name="NMBluetoothCapabilities"></a><h3>enum NMBluetoothCapabilities</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a> values indicate the usable capabilities of a
 Bluetooth device.</p>
-<p>(Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.52.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.52.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1309,9 +1305,8 @@ Bluetooth device.</p>
 technology families a modem device supports.  For more information on the
 specific access technologies the device supports use the ModemManager D-Bus
 API.</p>
-<p>(Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.53.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.53.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1363,8 +1358,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMDeviceState"></a><h3>enum NMDeviceState</h3>
-<p>(Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)</p>
+<a name="NMWimaxNspNetworkType"></a><h3>enum NMWimaxNspNetworkType</h3>
+<p>WiMAX network type.</p>
 <div class="refsect3">
 <a name="id-1.3.6.7.54.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -1375,6 +1370,50 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 </colgroup>
 <tbody>
 <tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-UNKNOWN:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p></td>
+<td class="enum_member_description">
+<p>unknown network type</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-HOME:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_HOME</p></td>
+<td class="enum_member_description">
+<p>home network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER</p></td>
+<td class="enum_member_description">
+<p>partner network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-WIMAX-NSP-NETWORK-TYPE-ROAMING-PARTNER:CAPS"></a>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER</p></td>
+<td class="enum_member_description">
+<p>roaming partner network</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceState"></a><h3>enum NMDeviceState</h3>
+<div class="refsect3">
+<a name="id-1.3.6.7.55.3"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-STATE-UNKNOWN:CAPS"></a>NM_DEVICE_STATE_UNKNOWN</p></td>
 <td class="enum_member_description">
 <p>the device's state is unknown</p>
@@ -1495,9 +1534,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <div class="refsect2">
 <a name="NMDeviceStateReason"></a><h3>enum NMDeviceStateReason</h3>
 <p>Device state change reason codes</p>
-<p>(Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.55.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.56.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -1953,9 +1991,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>(Corresponds to the NM_METERED type in nm-device.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.56.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.57.3"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2009,9 +2046,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMActiveConnectionState" title="enum NMActiveConnectionState"><span class="type">NMActiveConnectionState</span></a> values indicate the state of a connection to a
 specific network while it is starting, connected, or disconnecting from that
 network.</p>
-<p>(Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.57.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.58.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2064,9 +2100,8 @@ network.</p>
 <div class="refsect2">
 <a name="NMSecretAgentGetSecretsFlags"></a><h3>enum NMSecretAgentGetSecretsFlags</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> values modify the behavior of a GetSecrets request.</p>
-<p>(Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.58.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.59.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2136,9 +2171,8 @@ network.</p>
 <div class="refsect2">
 <a name="NMSecretAgentCapabilities"></a><h3>enum NMSecretAgentCapabilities</h3>
 <p><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities"><span class="type">NMSecretAgentCapabilities</span></a> indicate various capabilities of the agent.</p>
-<p>(Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.)</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.59.5"></a><h4>Members</h4>
+<a name="id-1.3.6.7.60.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -2279,7 +2313,7 @@ VPN plugin authentication dialogs.</p>
 <a name="NMIPTunnelMode"></a><h3>enum NMIPTunnelMode</h3>
 <p>The tunneling mode.</p>
 <div class="refsect3">
-<a name="id-1.3.6.7.77.4"></a><h4>Members</h4>
+<a name="id-1.3.6.7.78.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">