Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 53 insertions, 26 deletions

diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index db68214d..dd6fc4bd 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -6,12 +6,27 @@
 
     <method name="GetDevices">
       <tp:docstring>
-        Get the list of network devices.
+        Get the list of realized network devices.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
       <arg name="devices" type="ao" direction="out">
         <tp:docstring>
-          List of object paths of network devices known to the system.
+          List of object paths of network devices known to the system.  This
+          list does not include device placeholders (see GetAllDevices()).
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetAllDevices">
+      <tp:docstring>
+        Get the list of all network devices.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_all_devices"/>
+      <arg name="devices" type="ao" direction="out">
+        <tp:docstring>
+          List of object paths of network devices and device placeholders
+          (eg, devices that do not yet exist but which can be automatically
+          created by NetworkManager if one of their AvailableConnections
+          was activated).
         </tp:docstring>
       </arg>
     </method>
@@ -22,7 +37,6 @@
         interface name.  Note that some devices (usually modems) only have an
         IP interface name when they are connected.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_device_by_ip_iface"/>
       <arg name="iface" type="s" direction="in">
         <tp:docstring>
           Interface name of the device to find.
@@ -36,8 +50,6 @@
     </method>
 
     <method name="ActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Activate a connection using the supplied device.
       </tp:docstring>
@@ -76,8 +88,6 @@
     </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
@@ -121,8 +131,6 @@
       <tp:docstring>
         Deactivate an active connection.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="active_connection" type="o" direction="in">
         <tp:docstring>
           The currently active connection to deactivate.
@@ -131,8 +139,6 @@
     </method>
 
     <method name="Sleep">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Control the NetworkManager daemon's sleep state.  When asleep, all
         interfaces that it manages are deactivated.  When awake, devices are
@@ -147,8 +153,6 @@
     </method>
 
     <method name="Enable">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Control whether overall networking is enabled or disabled.  When
         disabled, all interfaces that NM manages are deactivated.  When enabled,
@@ -165,8 +169,6 @@
     </method>
 
     <method name="GetPermissions">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
@@ -193,14 +195,18 @@
     </signal>
 
     <method name="SetLogging">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Set logging verbosity and which operations are logged.
       </tp:docstring>
       <arg name="level" type="s" direction="in">
         <tp:docstring>
-          One of [ERR, WARN, INFO, DEBUG, TRACE].
+          One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].
+          This level is applied to the domains as specified in the domains
+          argument. Except for the special level "KEEP", all unmentioned
+          domains are disabled entirely. "KEEP" is special and allows
+          not to change the current setting except for the specified
+          domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only
+          touch the platform domain.
         </tp:docstring>
       </arg>
       <arg name="domains" type="s" direction="in">
@@ -223,7 +229,6 @@
     </method>
 
     <method name="GetLogging">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_logging"/>
       <tp:docstring>
         Get current logging verbosity level and operations domains.
       </tp:docstring>
@@ -240,8 +245,6 @@
     </method>
 
     <method name="CheckConnectivity">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_check_connectivity"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
 	Re-check the network connectivity state.
       </tp:docstring>
@@ -257,13 +260,23 @@
         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="Devices" type="ao" access="read">
       <tp:docstring>
-        The list of network devices/interfaces NetworkManager knows about.
+        The list of realized network devices. Realized devices are those which
+        have backing resources (eg from the kernel or a management daemon like
+        ModemManager, teamd, etc).
+      </tp:docstring>
+    </property>
+
+    <property name="AllDevices" type="ao" access="read">
+      <tp:docstring>
+        The list of both realized and un-realized network devices. Un-realized
+        devices are software devices which do not yet have backing resources,
+        but for which backing resources can be created if the device is
+        activated.
       </tp:docstring>
     </property>
 
@@ -337,8 +350,8 @@
 
     <property name="Metered" type="u" access="read" tp:type="NM_METERED">
       <tp:docstring>
-        Wheter the connectivity is metered. This is equivalent to the
-        metered property of the device associated with the primary
+        Indicates whether the connectivity is metered. This is equivalent
+        to the metered property of the device associated with the primary
         connection.
       </tp:docstring>
     </property>
@@ -388,6 +401,20 @@
       </tp:docstring>
     </property>
 
+    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite">
+      <tp:docstring>
+        Dictionary of global DNS settings where the key is one of
+        "searches", "options" and "domains".  The values for the
+        "searches" and "options" keys are string arrays describing the
+        list of search domains and resolver options, respectively.
+        The value of the "domains" key is a second-level dictionary,
+        where each key is a domain name, and each key's value is a
+        third-level dictionary with the keys "servers" and
+        "options". "servers" is a string array of DNS servers,
+        "options" is a string array of domain-specific options.
+      </tp:docstring>
+    </property>
+
     <signal name="PropertiesChanged">
       <tp:docstring>
         NetworkManager's properties changed.