Imported Upstream version 0.9.0 upstream/0.9.0

7 files changed, 22 insertions, 17 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 320245ee..7b549c12 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-	all.xml \
+	all.xml.in \
 	generic-types.xml \
 	errors.xml \
 	vpn-errors.xml \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index d0320e54..95c3c47e 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -34,7 +34,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = introspection
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/all.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
@@ -51,7 +52,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = all.xml
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -269,7 +270,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = \
-	all.xml \
+	all.xml.in \
 	generic-types.xml \
 	errors.xml \
 	vpn-errors.xml \
@@ -329,6 +330,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+all.xml: $(top_builddir)/config.status $(srcdir)/all.xml.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/introspection/all.xml b/introspection/all.xml.in
index 5d1baf01..4d2c2721 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml.in
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>NetworkManager D-Bus Interface Specification</tp:title>
-<tp:version>0.9</tp:version>
+<tp:version>@VERSION@</tp:version>
 
 
 <tp:copyright>Copyright (C) 2008 - 2011 Red Hat, Inc.</tp:copyright>
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index 0b1e3e6e..e26caacf 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/org/freedesktop/NetworkManager/AgentManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.AgentManager">
 
     <method name="Register">
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 1bb76d09..f5fd7abc 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- 
-  READ ME! READ ME! READ ME! READ ME! READ ME!
-
-  This file needs to be kept in sync with nm-manager-client.xml with the exception of
-  the legacy methods at the end of this file.
--->
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager">
     <method name="GetDevices">
       <tp:docstring>
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index daf287c6..0a67efdc 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -5,7 +5,13 @@
     <interface name="org.freedesktop.NetworkManager.SecretAgent">
         <tp:docstring>
             Private D-Bus interface used by secret agents that store and provide
-            secrets to NetworkManager.
+            secrets to NetworkManager.  If an agent provides secrets to
+            NetworkManager as part of connection creation, and the some of those
+            secrets are "agent owned" the agent should store those secrets
+            itself and should not expect its SaveSecrets() method to be called.
+            SaveSecrets() will be called eg if some program other than the
+            agent itself (like a connection editor) changes the secrets out of
+            band.
         </tp:docstring>
 
         <method name="GetSecrets">
@@ -123,7 +129,10 @@
                 <tp:docstring>
                     Nested settings maps containing the entire connection
                     (including secrets), for which the agent should save the
-                    secrets to backing storage.
+                    secrets to backing storage.  This method will not be called
+                    when the agent itself is the process creating or updating
+                    a connection; in that case the agent is assumed to have
+                    already saved those secrets since it had them already.
                 </tp:docstring>
             </arg>
             <arg name="connection_path" type="o" direction="in">
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index 64163534..301cde76 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/org/freedesktop/NetworkManager/Settings" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Settings">
     <tp:docstring>
       The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.