Merge tag 'upstream/0.9.4.0'

Upstream version 0.9.4.0

1 files changed, 62 insertions, 0 deletions

diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 5fdda96d..d12d4778 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -51,6 +51,11 @@
         The current state of the device.
       </tp:docstring>
     </property>
+    <property name="StateReason" type="(uu)" access="read" tp:type="NM_DEVICE_STATE_REASON_STRUCT">
+      <tp:docstring>
+        The current state and reason for changing to that state.
+      </tp:docstring>
+    </property>
     <property name="ActiveConnection" type="o" access="read">
       <tp:docstring>
         Object path of an ActiveConnection object that "owns" this device during
@@ -236,6 +241,21 @@
           wireline data network.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="INFINIBAND" value="9">
+        <tp:docstring>
+          The device is an IP-capable InfiniBand interface.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BOND" value="10">
+        <tp:docstring>
+          The device is a bond master interface.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="VLAN" value="11">
+        <tp:docstring>
+          The device is a VLAN interface.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
     <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
@@ -476,7 +496,49 @@
           The Bluetooth connection timed out or failed.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_NOT_INSERTED" value="45">
+        <tp:docstring>
+          GSM Modem's SIM Card not inserted.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_PIN_REQUIRED" value="46">
+        <tp:docstring>
+          GSM Modem's SIM Pin required.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_PUK_REQUIRED" value="47">
+        <tp:docstring>
+          GSM Modem's SIM Puk required.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="GSM_SIM_WRONG" value="48">
+        <tp:docstring>
+          GSM Modem's SIM wrong
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="INFINIBAND_MODE" value="49">
+        <tp:docstring>
+          InfiniBand device does not support connected mode.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">
+        <tp:docstring>
+          A dependency of the connection failed.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
+    <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
+      <tp:member type="u" name="state" tp:type="NM_DEVICE_STATE">
+        <tp:docstring>
+          The device state.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="u" name="reason" tp:type="NM_DEVICE_STATE_REASON">
+        <tp:docstring>
+          The reason for originally changing to the device state.
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
   </interface>
 </node>