Imported Upstream version 0.8.998upstream/0.8.998

1 files changed, 94 insertions, 51 deletions

diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index f281d9d2c..5eb4614f3 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -27,11 +27,6 @@
       <tp:docstring>
         Activate a connection using the supplied device.
       </tp:docstring>
-      <arg name="service_name" type="s" direction="in">
-        <tp:docstring>
-          The D-Bus service name of the settings service that provides this connection.
-        </tp:docstring>
-      </arg>
       <arg name="connection" type="o" direction="in">
         <tp:docstring>
           The connection to activate the devices with.
@@ -62,7 +57,6 @@
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
         <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.InvalidService"/>
         <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
           <tp:docstring>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</tp:docstring>
         </tp:error>
@@ -72,6 +66,55 @@
       </tp:possible-errors>
     </method>
 
+    <method name="AddAndActivateConnection">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_add_and_activate_connection"/>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <tp:docstring>
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      </tp:docstring>
+      <arg name="connection" type="a{sa{sv}}" direction="in">
+        <tp:docstring>
+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="in">
+        <tp:docstring>
+          The object path of device to be activated using the given connection.
+        </tp:docstring>
+      </arg>
+      <arg name="specific_object" type="o" direction="in">
+        <tp:docstring>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        </tp:docstring>
+      </arg>
+      <arg name="path" type="o" direction="out">
+        <tp:docstring>
+          Object path of the new connection that was just added.
+        </tp:docstring>
+      </arg>
+      <arg name="active_connection" type="o" direction="out">
+        <tp:docstring>
+          The path of the active connection object representing this active connection.
+        </tp:docstring>
+      </arg>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
+          <tp:docstring>The connection is invalid for this device.</tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
     <method name="DeactivateConnection">
       <tp:docstring>
         Deactivate an active connection.
@@ -169,6 +212,15 @@
       </arg>
     </method>
 
+    <method name="state">
+      <tp:docstring>
+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_state"/>
+      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
+    </method>
+
     <property name="NetworkingEnabled" type="b" access="read">
       <tp:docstring>
         Indicates if overall networking is currently enabled or not.  See the
@@ -200,6 +252,18 @@
       </tp:docstring>
     </property>
 
+    <property name="WimaxEnabled" type="b" access="readwrite">
+      <tp:docstring>
+        Indicates if WiMAX devices are currently enabled or not.
+      </tp:docstring>
+    </property>
+
+    <property name="WimaxHardwareEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      </tp:docstring>
+    </property>
+
     <property name="ActiveConnections" type="ao" access="read">
       <tp:docstring>
         List of active connection object paths.
@@ -268,67 +332,46 @@
       </tp:docstring>
       <tp:enumvalue suffix="UNKNOWN" value="0">
         <tp:docstring>
-          The NetworkManager daemon is in an unknown state.
+          Networking state is unknown.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="ASLEEP" value="1">
+      <tp:enumvalue suffix="ASLEEP" value="10">
         <tp:docstring>
-          The NetworkManager daemon is asleep and all interfaces managed by it are inactive.
+          Networking is inactive and all devices are disabled.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTING" value="2">
+      <tp:enumvalue suffix="DISCONNECTED" value="20">
         <tp:docstring>
-          The NetworkManager daemon is connecting a device.  FIXME: What does this mean when one device is active and another is connecting?
+          There is no active network connection.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED" value="3">
+      <tp:enumvalue suffix="DISCONNECTING" value="30">
         <tp:docstring>
-          The NetworkManager daemon is connected.
+          Network connections are being cleaned up.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="4">
+      <tp:enumvalue suffix="CONNECTING" value="40">
         <tp:docstring>
-          The NetworkManager daemon is disconnected.
+          A network device is connecting to a network and there is no other
+          available network connection.
         </tp:docstring>
       </tp:enumvalue>
-    </tp:enum>
-
-    <!-- Legacy methods to maintain backwards compatibility for 0.6 branch. -->
-
-    <signal name="StateChange">
-      <tp:docstring>
-        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_STATE">
+      <tp:enumvalue suffix="CONNECTED_LOCAL" value="50">
         <tp:docstring>
-          The new state of NetworkManager.
+          A network device is connected, but there is only link-local connectivity.
         </tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="sleep">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_sleep"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="wake">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When awake, all known interfaces are available to be activated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_wake"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="state">
-      <tp:docstring>
-        DEPRECATED.  The overall state of the NetworkManager daemon.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_state"/>
-      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
-    </method>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_SITE" value="60">
+        <tp:docstring>
+          A network device is connected, but there is only site-local connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70">
+        <tp:docstring>
+          A network device is connected, with global network connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
 
   </interface>
 </node>