Merge commit 'upstream/0.8.999' into experimental

5 files changed, 54 insertions, 3 deletions

diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index fd64eca6..d0320e54 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -76,6 +76,10 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -193,6 +197,8 @@ POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
@@ -214,6 +220,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 41aeab62..1594764e 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -8,6 +8,12 @@
     <property name="SpecificObject" type="o" access="read">
       <tp:docstring>A specific object associated with the active connection.</tp:docstring>
     </property>
+    <property name="Uuid" type="s" access="read">
+      <tp:docstring>
+        The UUID of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      </tp:docstring>
+    </property>
     <property name="Devices" type="ao" access="read">
       <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
     </property>
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 5eb4614f..ee84a47b 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -21,6 +21,25 @@
       </arg>
     </method>
 
+    <method name="GetDeviceByIpIface">
+      <tp:docstring>
+        Return the object path of the network device referenced by its IP
+        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.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="out">
+        <tp:docstring>
+          Object path of the network device.
+        </tp:docstring>
+      </arg>
+    </method>
+
     <method name="ActivateConnection">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 9655c2b9..daf287c6 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -38,9 +38,11 @@
             <arg name="hints" type="as" direction="in">
                 <tp:docstring>
                     Array of strings of key names in the requested setting for
-                    which NetworkManager thinks a secrets may be required.  The
-                    Agent should return any secrets it has, or that it thinks
-                    are required, regardless of what hints NetworkManager sends
+                    which NetworkManager thinks a secrets may be required,
+                    and/or well-known identifiers and data that may be useful
+                    to the client in processing the secrets request. The Agent
+                    should return any secrets it has, or that it thinks are
+                    required, regardless of what hints NetworkManager sends
                     in this request.
                 </tp:docstring>
             </arg>
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index f816b087..64163534 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -18,6 +18,23 @@
       </arg>
     </method>
 
+    <method name="GetConnectionByUuid">
+      <tp:docstring>
+        Retrieve the object path of a connection, given that connection's UUID.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_get_connection_by_uuid"/>
+      <arg name="uuid" type="s" direction="in">
+        <tp:docstring>
+          The UUID to find the connection object path for.
+        </tp:docstring>
+      </arg>
+      <arg name="connection" type="o" direction="out">
+        <tp:docstring>
+          The connection's object path.
+        </tp:docstring>
+      </arg>
+    </method>
+
     <method name="AddConnection">
       <tp:docstring>
         Add new connection.