From 263bf4c0c89bb88dc995acd9a6a2de9095fbd461 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 23 Aug 2011 19:16:47 +0200 Subject: Imported Upstream version 0.9.0 --- introspection/Makefile.am | 2 +- introspection/Makefile.in | 9 ++++-- introspection/all.xml | 61 -------------------------------------- introspection/all.xml.in | 61 ++++++++++++++++++++++++++++++++++++++ introspection/nm-agent-manager.xml | 2 +- introspection/nm-manager.xml | 9 +----- introspection/nm-secret-agent.xml | 13 ++++++-- introspection/nm-settings.xml | 2 +- 8 files changed, 82 insertions(+), 77 deletions(-) delete mode 100644 introspection/all.xml create mode 100644 introspection/all.xml.in (limited to 'introspection') 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 deleted file mode 100644 index 5d1baf01..00000000 --- a/introspection/all.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -NetworkManager D-Bus Interface Specification -0.9 - - -Copyright (C) 2008 - 2011 Red Hat, Inc. -Copyright (C) 2008 - 2009 Novell, Inc. - - -

This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version.

- -

This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/all.xml.in b/introspection/all.xml.in new file mode 100644 index 00000000..4d2c2721 --- /dev/null +++ b/introspection/all.xml.in @@ -0,0 +1,61 @@ + + +NetworkManager D-Bus Interface Specification +@VERSION@ + + +Copyright (C) 2008 - 2011 Red Hat, Inc. +Copyright (C) 2008 - 2009 Novell, Inc. + + +

This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version.

+ +

This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details.

+ +

You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + 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 @@ - - - + 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 @@ 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. @@ -123,7 +129,10 @@ 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. 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 @@ - + The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager. -- cgit 1.3.0-6-gf8a5