Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 196 insertions, 13 deletions

diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index bee69df6..50ac79d3 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -100,6 +100,27 @@
 </td>
 </tr>
 <tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-device-id" title="nm_setting_gsm_get_device_id ()">nm_setting_gsm_get_device_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-sim-id" title="nm_setting_gsm_get_sim_id ()">nm_setting_gsm_get_sim_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingGsm.html#nm-setting-gsm-get-sim-operator-id" title="nm_setting_gsm_get_sim_operator_id ()">nm_setting_gsm_get_sim_operator_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
 <td class="function_type">
 <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>
 </td>
@@ -134,6 +155,12 @@
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
+<td class="property_type">
+<span class="type">gchar</span> *</td>
+<td class="property_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm--device-id" title="The “device-id” property">device-id</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type"><span class="type">gboolean</span></td>
 <td class="property_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm--home-only" title="The “home-only” property">home-only</a></td>
 <td class="property_flags">Read / Write</td>
@@ -175,6 +202,18 @@
 <tr>
 <td class="property_type">
 <span class="type">gchar</span> *</td>
+<td class="property_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm--sim-id" title="The “sim-id” property">sim-id</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type">
+<span class="type">gchar</span> *</td>
+<td class="property_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm--sim-operator-id" title="The “sim-operator-id” property">sim-operator-id</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type">
+<span class="type">gchar</span> *</td>
 <td class="property_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm--username" title="The “username” property">username</a></td>
 <td class="property_flags">Read / Write</td>
 </tr>
@@ -229,6 +268,18 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-HOME-ONLY:CAPS" title="NM_SETTING_GSM_HOME_ONLY">NM_SETTING_GSM_HOME_ONLY</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-DEVICE-ID:CAPS" title="NM_SETTING_GSM_DEVICE_ID">NM_SETTING_GSM_DEVICE_ID</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SIM-ID:CAPS" title="NM_SETTING_GSM_SIM_ID">NM_SETTING_GSM_SIM_ID</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS" title="NM_SETTING_GSM_SIM_OPERATOR_ID">NM_SETTING_GSM_SIM_OPERATOR_ID</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -434,11 +485,89 @@ nm_setting_gsm_get_home_only (<em class="parameter"><code><a class="link" href="
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-gsm-get-device-id"></a><h3>nm_setting_gsm_get_device_id ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_gsm_get_device_id (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="id-1.4.15.8.10.4"></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="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.15.8.10.5"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--device-id" title="The “device-id” property"><span class="type">“device-id”</span></a> property of the setting</p>
+</div>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-sim-id"></a><h3>nm_setting_gsm_get_sim_id ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_gsm_get_sim_id (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="id-1.4.15.8.11.4"></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="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.15.8.11.5"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--sim-id" title="The “sim-id” property"><span class="type">“sim-id”</span></a> property of the setting</p>
+</div>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-gsm-get-sim-operator-id"></a><h3>nm_setting_gsm_get_sim_operator_id ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_setting_gsm_get_sim_operator_id (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="id-1.4.15.8.12.4"></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="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.15.8.12.5"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingGsm.html#NMSettingGsm--sim-operator-id" title="The “sim-operator-id” property"><span class="type">“sim-operator-id”</span></a> property of the setting</p>
+</div>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-gsm-get-pin-flags"></a><h3>nm_setting_gsm_get_pin_flags ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>
 nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.4.15.8.10.4"></a><h4>Parameters</h4>
+<a name="id-1.4.15.8.13.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -453,7 +582,7 @@ nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.15.8.10.5"></a><h4>Returns</h4>
+<a name="id-1.4.15.8.13.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--pin" title="The “pin” property"><span class="type">“pin”</span></a></p>
 </div>
 </div>
@@ -463,7 +592,7 @@ nm_setting_gsm_get_pin_flags (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a>
 nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> *setting</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.4.15.8.11.4"></a><h4>Parameters</h4>
+<a name="id-1.4.15.8.14.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -478,7 +607,7 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.15.8.11.5"></a><h4>Returns</h4>
+<a name="id-1.4.15.8.14.5"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html#NMSettingSecretFlags" title="enum NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingGsm.html#NMSettingGsm--password" title="The “password” property"><span class="type">“password”</span></a></p>
 </div>
 </div>
@@ -493,55 +622,73 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NUMBER:CAPS"></a><h3>NM_SETTING_GSM_NUMBER</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NUMBER         "number"
+<pre class="programlisting">#define NM_SETTING_GSM_NUMBER          "number"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-USERNAME:CAPS"></a><h3>NM_SETTING_GSM_USERNAME</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_USERNAME       "username"
+<pre class="programlisting">#define NM_SETTING_GSM_USERNAME        "username"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD       "password"
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD        "password"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PASSWORD_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
+<pre class="programlisting">#define NM_SETTING_GSM_PASSWORD_FLAGS  "password-flags"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-APN:CAPS"></a><h3>NM_SETTING_GSM_APN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_APN            "apn"
+<pre class="programlisting">#define NM_SETTING_GSM_APN             "apn"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-NETWORK-ID:CAPS"></a><h3>NM_SETTING_GSM_NETWORK_ID</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID     "network-id"
+<pre class="programlisting">#define NM_SETTING_GSM_NETWORK_ID      "network-id"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN:CAPS"></a><h3>NM_SETTING_GSM_PIN</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PIN            "pin"
+<pre class="programlisting">#define NM_SETTING_GSM_PIN             "pin"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-PIN-FLAGS:CAPS"></a><h3>NM_SETTING_GSM_PIN_FLAGS</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
+<pre class="programlisting">#define NM_SETTING_GSM_PIN_FLAGS       "pin-flags"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
 <a name="NM-SETTING-GSM-HOME-ONLY:CAPS"></a><h3>NM_SETTING_GSM_HOME_ONLY</h3>
-<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY      "home-only"
+<pre class="programlisting">#define NM_SETTING_GSM_HOME_ONLY       "home-only"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-GSM-DEVICE-ID:CAPS"></a><h3>NM_SETTING_GSM_DEVICE_ID</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_DEVICE_ID       "device-id"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-GSM-SIM-ID:CAPS"></a><h3>NM_SETTING_GSM_SIM_ID</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_SIM_ID          "sim-id"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS"></a><h3>NM_SETTING_GSM_SIM_OPERATOR_ID</h3>
+<pre class="programlisting">#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
 </pre>
 </div>
 </div>
@@ -562,6 +709,17 @@ The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingGsm--device-id"></a><h3>The <code class="literal">“device-id”</code> property</h3>
+<pre class="programlisting">  “device-id”                <span class="type">gchar</span> *</pre>
+<p>The device unique identifier (as given by the WWAN management service)
+which this connection applies to.  If given, the connection will only
+apply to the specified device.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingGsm--home-only"></a><h3>The <code class="literal">“home-only”</code> property</h3>
 <pre class="programlisting">  “home-only”                <span class="type">gboolean</span></pre>
 <p>When <code class="literal">TRUE</code>, only connections to the home network will be allowed.
@@ -628,6 +786,31 @@ device.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingGsm--sim-id"></a><h3>The <code class="literal">“sim-id”</code> property</h3>
+<pre class="programlisting">  “sim-id”                   <span class="type">gchar</span> *</pre>
+<p>The SIM card unique identifier (as given by the WWAN management service)
+which this connection applies to.  If given, the connection will apply
+to any device also allowed by <a class="link" href="NMSettingGsm.html#NMSettingGsm--device-id" title="The “device-id” property"><span class="type">“device-id”</span></a> which contains a
+SIM card matching the given identifier.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingGsm--sim-operator-id"></a><h3>The <code class="literal">“sim-operator-id”</code> property</h3>
+<pre class="programlisting">  “sim-operator-id”          <span class="type">gchar</span> *</pre>
+<p>A MCC/MNC string like "310260" or "21601" identifying the specific
+mobile network operator which this connection applies to.  If given,
+the connection will apply to any device also allowed by
+<a class="link" href="NMSettingGsm.html#NMSettingGsm--device-id" title="The “device-id” property"><span class="type">“device-id”</span></a> and <a class="link" href="NMSettingGsm.html#NMSettingGsm--sim-id" title="The “sim-id” property"><span class="type">“sim-id”</span></a> which contains a SIM
+card provisioined by the given operator.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: NULL</p>
+<p class="since">Since: 1.2</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingGsm--username"></a><h3>The <code class="literal">“username”</code> property</h3>
 <pre class="programlisting">  “username”                 <span class="type">gchar</span> *</pre>
 <p>The username used to authenticate with the network, if required.  Many