From d465e5fac63f36bcf4069e36827f4b62c494556d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 27 May 2011 19:57:25 +0200
Subject: Imported Upstream version 0.8.9997

---
 introspection/nm-active-connection.xml | 8 ++++++++
 introspection/nm-device.xml            | 8 ++++++++
 introspection/nm-manager.xml           | 3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'introspection')

diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 1594764e..a150b2c8 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -2,6 +2,14 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
+    <tp:docstring>
+      Objects that implement the Connection.Active interface represent an attempt
+      to connect to a network using the details provided by a Connection object.
+      The Connection.Active object tracks the life-cycle of the connection
+      attempt and if successful indicates whether the connected network is the
+      "default" or preferred network for access.
+    </tp:docstring>
+
     <property name="Connection" type="o" access="read">
       <tp:docstring>The path of the connection.</tp:docstring>
     </property>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 13c542a6..5fdda96d 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -51,6 +51,14 @@
         The current state of the device.
       </tp:docstring>
     </property>
+    <property name="ActiveConnection" type="o" access="read">
+      <tp:docstring>
+        Object path of an ActiveConnection object that "owns" this device during
+        activation.  The ActiveConnection object tracks the life-cycle of a
+        connection to a specific network and implements the
+        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
+      </tp:docstring>
+    </property>
     <property name="Ip4Config" type="o" access="read">
       <tp:docstring>
         Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index ee84a47b..1bb76d09 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -226,7 +226,8 @@
           related to that domain.  Available domains are: [NONE, HW, RFKILL,
           ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
           DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC]
+          DEVICE, OLPC].  If an empty string is given, the log level is changed
+          but the current set of log domains remains unchanged.
         </tp:docstring>
       </arg>
     </method>
-- 
cgit 1.3.0-6-gf8a5