Merge remote branch 'chromium/to-upstream'

2011-01-24 13:56:40 -06:00
parent 12f1b351e8 f047ca66a4
commit 2b2ca316a1
2 changed files with 101 additions and 2 deletions
@@ -104,6 +104,11 @@
          Reason for state transition.
        </tp:docstring>
      </arg>
+      <arg name="reason" type="u" tp:type="MM_MODEM_CONNECTION_STATE_CHANGED_REASON">
+        <tp:docstring>
+          Reason for this state change.
+        </tp:docstring>
+      </arg>
    </signal>

    <property name="Device" type="s" access="read">
@@ -222,5 +227,24 @@
      </tp:enumvalue>
    </tp:enum>

+    <tp:enum name="MM_MODEM_CONNECTION_STATE_CHANGE_REASON" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          Reason unknown or not reportable.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="REQUESTED" value="1">
+        <tp:docstring>
+          Connection state change was requested by an interface user.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUSPEND" value="2">
+        <tp:docstring>
+          Connection state change was caused by a system suspend.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+
  </interface>
 </node>