From 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 14:23:24 +0200 Subject: Imported Upstream version 0.9.5.96 --- docs/Makefile.in | 27 +++++---- docs/api/Makefile.am | 2 + docs/api/Makefile.in | 68 +++++++++++----------- docs/api/html/NetworkManager.devhelp2 | 28 ++++----- docs/api/html/index.html | 32 +++++----- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +++++++++--------- docs/api/html/ref-settings.html | 42 ++++++------- docs/api/html/spec.html | 8 ++- docs/api/spec.html | 8 ++- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 28 +++++---- docs/libnm-glib/html/NMClient.html | 8 +-- docs/libnm-glib/html/NMDevice.html | 18 ++++-- docs/libnm-glib/html/NMSecretAgent.html | 2 +- docs/libnm-glib/html/api-index-full.html | 4 ++ docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 1 + .../html/libnm-glib-NMVpnPluginUiWidget.html | 9 +++ docs/libnm-glib/html/libnm-glib.devhelp2 | 1 + docs/libnm-glib/libnm-glib-sections.txt | 1 + docs/libnm-glib/tmpl/libnm_glib.sgml | 2 + docs/libnm-glib/tmpl/nm-access-point.sgml | 2 + docs/libnm-glib/tmpl/nm-active-connection.sgml | 2 + docs/libnm-glib/tmpl/nm-client.sgml | 2 + docs/libnm-glib/tmpl/nm-device-adsl.sgml | 2 + docs/libnm-glib/tmpl/nm-device-bond.sgml | 2 + docs/libnm-glib/tmpl/nm-device-bt.sgml | 2 + docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 2 + docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 2 + docs/libnm-glib/tmpl/nm-device-modem.sgml | 2 + docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 2 + docs/libnm-glib/tmpl/nm-device-vlan.sgml | 2 + docs/libnm-glib/tmpl/nm-device-wifi.sgml | 2 + docs/libnm-glib/tmpl/nm-device-wimax.sgml | 2 + docs/libnm-glib/tmpl/nm-device.sgml | 2 + docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 2 + docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 2 + docs/libnm-glib/tmpl/nm-glib-enum-types.sgml | 2 + docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 2 + docs/libnm-glib/tmpl/nm-ip4-config.sgml | 2 + docs/libnm-glib/tmpl/nm-ip6-config.sgml | 2 + docs/libnm-glib/tmpl/nm-object.sgml | 2 + docs/libnm-glib/tmpl/nm-remote-connection.sgml | 2 + docs/libnm-glib/tmpl/nm-remote-settings.sgml | 2 + docs/libnm-glib/tmpl/nm-secret-agent.sgml | 2 + docs/libnm-glib/tmpl/nm-types.sgml | 2 + docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 2 + docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml | 2 + .../tmpl/nm-vpn-plugin-ui-interface.sgml | 9 +++ docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 2 + docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 2 + docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 2 + docs/libnm-util/Makefile.in | 28 +++++---- docs/libnm-util/html/NMSettingConnection.html | 45 -------------- docs/libnm-util/html/api-index-full.html | 24 ++------ docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.sgml | 6 +- docs/libnm-util/html/libnm-util-nm-utils.html | 22 +++++++ docs/libnm-util/html/libnm-util.devhelp2 | 6 +- docs/libnm-util/libnm-util-sections.txt | 6 +- docs/libnm-util/tmpl/nm-setting-connection.sgml | 35 ----------- docs/libnm-util/tmpl/nm-utils.sgml | 9 +++ 64 files changed, 325 insertions(+), 282 deletions(-) (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index 558a1a60..1ca53d32 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,11 +53,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -585,10 +585,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index e061ec62..571926f5 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -55,6 +55,8 @@ DOC_MODULE=NetworkManager # The top-level SGML file. DOC_MAIN_SGML_FILE=network-manager-docs.xml +DOC_SOURCE_DIR=$(srcdir) + # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 31eeeb6e..c3c4f65c 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,8 +72,8 @@ am__DEPENDENCIES_1 = @WITH_DOCS_TRUE@generate_settings_spec_DEPENDENCIES = \ @WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ @WITH_DOCS_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -85,21 +85,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(generate_settings_spec_SOURCES) DIST_SOURCES = $(am__generate_settings_spec_SOURCES_DIST) @@ -377,6 +377,7 @@ AUTOMAKE_OPTIONS = 1.7 # The top-level SGML file. @WITH_DOCS_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml +@WITH_DOCS_TRUE@DOC_SOURCE_DIR = $(srcdir) # Extra options to supply to gtkdoc-mkdb @WITH_DOCS_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml @@ -466,6 +467,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -486,7 +488,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -generate-settings-spec$(EXEEXT): $(generate_settings_spec_OBJECTS) $(generate_settings_spec_DEPENDENCIES) +generate-settings-spec$(EXEEXT): $(generate_settings_spec_OBJECTS) $(generate_settings_spec_DEPENDENCIES) $(EXTRA_generate_settings_spec_DEPENDENCIES) @rm -f generate-settings-spec$(EXEEXT) $(AM_V_CCLD)$(LINK) $(generate_settings_spec_OBJECTS) $(generate_settings_spec_LDADD) $(LIBS) @@ -502,44 +504,39 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< generate_settings_spec-generate-settings-spec.o: generate-settings-spec.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.o -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.o `test -f 'generate-settings-spec.c' || echo '$(srcdir)/'`generate-settings-spec.c generate_settings_spec-generate-settings-spec.obj: generate-settings-spec.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generate_settings_spec-generate-settings-spec.obj -MD -MP -MF $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/generate_settings_spec-generate-settings-spec.Tpo $(DEPDIR)/generate_settings_spec-generate-settings-spec.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generate-settings-spec.c' object='generate_settings_spec-generate-settings-spec.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(generate_settings_spec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generate_settings_spec-generate-settings-spec.obj `if test -f 'generate-settings-spec.c'; then $(CYGPATH_W) 'generate-settings-spec.c'; else $(CYGPATH_W) '$(srcdir)/generate-settings-spec.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -648,10 +645,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index af8fdfaf..afff285e 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 0fc54781..573f364f 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -22,11 +22,11 @@     
  

-

Version 0.9.5.95 +

Version 0.9.5.96

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -61,25 +61,25 @@

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index d2ae0ae2..81608829 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index b18b7aa6..3dbedb5e 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed

@@ -50,14 +50,14 @@

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

This section details the architectural and D-Bus API changes in NetworkManager 0.9.

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@

-User Secret Agents

+User Secret Agents

Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -190,7 +190,7 @@

-Connection Object Interface Changes

+Connection Object Interface Changes

Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

-

Table 20. 

+

Table 20. 

@@ -307,7 +307,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

The org.freedesktop.NetworkManager.Settings.AddConnection @@ -325,7 +325,7 @@

-Support for WiMAX Devices

+Support for WiMAX Devices

NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (NM_DEVICE_TYPE_WIMAX) and @@ -348,7 +348,7 @@

-New Device States

+New Device States

A few new device states have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@

-New Active Connection State

+New Active Connection State

Along with the new device states, an additional @@ -379,7 +379,7 @@

-Consolidated Modem Devices

+Consolidated Modem Devices

Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@

-Secret Property Flags

+Secret Property Flags

In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values:

-

Table 21. 

+

Table 21. 

@@ -486,7 +486,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

A few methods and signals of the org.freedesktop.NetworkManager interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements:

-

Table 22. 

+

Table 22. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index faff8ce8..abdef1d7 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

@@ -35,11 +35,11 @@

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -285,7 +285,7 @@


-

Table 3. bond setting

+

Table 3. bond setting

@@ -324,7 +324,7 @@


-

Table 4. cdma setting

+

Table 4. cdma setting

@@ -375,7 +375,7 @@


-

Table 5. connection setting

+

Table 5. connection setting

@@ -462,7 +462,7 @@


-

Table 6. gsm setting

+

Table 6. gsm setting

@@ -555,7 +555,7 @@


-

Table 7. infiniband setting

+

Table 7. infiniband setting

@@ -600,7 +600,7 @@


-

Table 8. ipv4 setting

+

Table 8. ipv4 setting

@@ -699,7 +699,7 @@


-

Table 9. ipv6 setting

+

Table 9. ipv6 setting

@@ -786,7 +786,7 @@


-

Table 10. 802-11-olpc-mesh setting

+

Table 10. 802-11-olpc-mesh setting

@@ -831,7 +831,7 @@


-

Table 11. ppp setting

+

Table 11. ppp setting

@@ -966,7 +966,7 @@


-

Table 12. pppoe setting

+

Table 12. pppoe setting

@@ -1017,7 +1017,7 @@


-

Table 13. serial setting

+

Table 13. serial setting

@@ -1074,7 +1074,7 @@


-

Table 14. vlan setting

+

Table 14. vlan setting

@@ -1137,7 +1137,7 @@


-

Table 15. vpn setting

+

Table 15. vpn setting

@@ -1188,7 +1188,7 @@


-

Table 16. wimax setting

+

Table 16. wimax setting

@@ -1227,7 +1227,7 @@


-

Table 17. 802-3-ethernet setting

+

Table 17. 802-3-ethernet setting

@@ -1320,7 +1320,7 @@


-

Table 18. 802-11-wireless setting

+

Table 18. 802-11-wireless setting

@@ -1431,7 +1431,7 @@


-

Table 19. 802-11-wireless-security setting

+

Table 19. 802-11-wireless-security setting

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 80c10325..4796dfd1 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.5.95

NetworkManager D-Bus Interface Specification

Version 0.9.5.95

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.5.96

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 @@ -586,6 +586,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

NM_DEVICE_TYPE_VLAN = 11
The device is a VLAN interface. +
NM_DEVICE_TYPE_ADSL = 12
+ The device is an ADSL device supporting PPPoE and PPPoATM protocols.

NM_DEVICE_STATE_REASON

NM_DEVICE_STATE_REASON_UNKNOWN = 0
The reason for the device state change is unknown.
NM_DEVICE_STATE_REASON_NONE = 1
@@ -688,7 +690,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50
A dependency of the connection failed. -
NM_DEVICE_STATE_REASON_BR2684_FAILED = 50
+
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51
Problem with the RFC 2684 Ethernet over ADSL bridge.

Sets of flags:

NM_DEVICE_CAP

NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.

Structure types:

NM_DEVICE_STATE_REASON_STRUCT - ( u: state, u: reason diff --git a/docs/api/spec.html b/docs/api/spec.html index 80c10325..4796dfd1 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.5.95

NetworkManager D-Bus Interface Specification

Version 0.9.5.95

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.5.96

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 @@ -586,6 +586,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

NM_DEVICE_TYPE_VLAN = 11
The device is a VLAN interface. +
NM_DEVICE_TYPE_ADSL = 12
+ The device is an ADSL device supporting PPPoE and PPPoATM protocols.

NM_DEVICE_STATE_REASON

NM_DEVICE_STATE_REASON_UNKNOWN = 0
The reason for the device state change is unknown.
NM_DEVICE_STATE_REASON_NONE = 1
@@ -688,7 +690,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50
A dependency of the connection failed. -
NM_DEVICE_STATE_REASON_BR2684_FAILED = 50
+
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51
Problem with the RFC 2684 Ethernet over ADSL bridge.

Sets of flags:

NM_DEVICE_CAP

NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.

Structure types:

NM_DEVICE_STATE_REASON_STRUCT - ( u: state, u: reason diff --git a/docs/api/version.xml b/docs/api/version.xml index 3bf70835..b8a4eaee 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.9.5.95 +0.9.5.96 diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index bd50f0ca..594126e3 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,11 +60,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -457,6 +457,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -526,10 +527,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 7133c489..f15a7839 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -1182,7 +1182,7 @@ Notifies that a

The "device-removed" signal

-
void                user_function                      (NMClient *widget,
+
void                user_function                      (NMClient *client,
                                                         GObject  *device,
                                                         gpointer  user_data)      : Run First

 

@@ -1192,7 +1192,7 @@ Notifies that a

- + @@ -1210,7 +1210,7 @@ Notifies that a

The "permission-changed" signal

-
void                user_function                      (NMClient *widget,
+
void                user_function                      (NMClient *client,
                                                         guint     permission,
                                                         guint     result,
                                                         gpointer  user_data)       : Run First

@@ -1221,7 +1221,7 @@ Notifies that a permission has changed
- + diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 5c6e7152..7602b851 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -1235,9 +1235,9 @@ The vendor string of the device.

The "state-changed" signal

void                user_function                      (NMDevice *device,
-                                                        guint     state,
-                                                        guint     arg2,
-                                                        guint     arg3,
+                                                        guint     new_state,
+                                                        guint     old_state,
+                                                        guint     reason,
                                                         gpointer  user_data)      : Run First

Notifies the state change of a NMDevice. @@ -1247,13 +1247,21 @@ Notifies the state change of a device :

-
+ - + + + + + + + + + diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 1ad2b84b..bada1083 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -310,7 +310,7 @@ To easily create the hash table to return the WiFi PSK, you could do something like this:

-

Example 1. Creating a secrets hash

+

Example 1. Creating a secrets hash

widget :

client :

 the client that received the signal

widget :

client :

 the client that received the signal
the client that received the signalthe device object that received the signal

state :

new_state :

 the new state of the device

old_state :

the previous state of the device

reason :

the reason describing the state change

user_data :

 user data set when the signal handler was connected.
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index 13330c48..aec1fde0 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -2088,6 +2088,10 @@ nm_device_adsl_new, function in NMDeviceAdsl
+NM_VPN_PLUGIN_UI_CAPABILITY_IPV6, macro in NMVpnPluginUiWidget +
+
+
NM_VPN_PLUGIN_UI_CAPABILITY_NONE, macro in NMVpnPluginUiWidget
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 4ae3cc09..7a9ece4b 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 86ef3641..4ca2e2f8 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -29,7 +29,7 @@

Copyright © 2011 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 2251b67f..cd95bbbf 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -781,6 +781,7 @@ + diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html index bc7d5bbc..9afd3d0a 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html @@ -43,6 +43,7 @@ enum NMVpnPluginUiWidgetInterface; #define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT #define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT +#define NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 #define NM_VPN_PLUGIN_UI_CAPABILITY_NONE #define NM_VPN_PLUGIN_UI_INTERFACE_DESC #define NM_VPN_PLUGIN_UI_INTERFACE_NAME @@ -217,6 +218,14 @@ struct +

NM_VPN_PLUGIN_UI_CAPABILITY_IPV6

+
#define NM_VPN_PLUGIN_UI_CAPABILITY_IPV6     0x04
+
+

+

+
+
+

NM_VPN_PLUGIN_UI_CAPABILITY_NONE

#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 08ca3a93..56ad45ea 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -553,6 +553,7 @@ + diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index 1ba78796..59d41933 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -780,6 +780,7 @@ NMVpnPluginUiInterfaceProp NMVpnPluginUiWidgetInterface NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT +NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 NM_VPN_PLUGIN_UI_CAPABILITY_NONE NM_VPN_PLUGIN_UI_INTERFACE_DESC NM_VPN_PLUGIN_UI_INTERFACE_NAME diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml index 325e10cb..ed0710b9 100644 --- a/docs/libnm-glib/tmpl/libnm_glib.sgml +++ b/docs/libnm-glib/tmpl/libnm_glib.sgml @@ -9,11 +9,13 @@ libnm_glib + + diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml index f869ab7c..41cade52 100644 --- a/docs/libnm-glib/tmpl/nm-access-point.sgml +++ b/docs/libnm-glib/tmpl/nm-access-point.sgml @@ -9,11 +9,13 @@ NMAccessPoint + + diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml index 5bbb6b3b..40528ae9 100644 --- a/docs/libnm-glib/tmpl/nm-active-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml @@ -9,11 +9,13 @@ NMActiveConnection + + diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml index 773592de..b2d11e38 100644 --- a/docs/libnm-glib/tmpl/nm-client.sgml +++ b/docs/libnm-glib/tmpl/nm-client.sgml @@ -9,11 +9,13 @@ NMClient + + diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml index dc26b35c..dc12af8e 100644 --- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml +++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml @@ -9,11 +9,13 @@ NMDeviceAdsl + + diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml index 8f9e8db6..955a2df4 100644 --- a/docs/libnm-glib/tmpl/nm-device-bond.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml @@ -9,11 +9,13 @@ NMDeviceBond + + diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml index 26582065..e0b17425 100644 --- a/docs/libnm-glib/tmpl/nm-device-bt.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml @@ -9,11 +9,13 @@ NMDeviceBt + + diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml index ea04914e..3f5735b5 100644 --- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml +++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml @@ -9,11 +9,13 @@ NMDeviceEthernet + + diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml index e94c6bae..94ad7b90 100644 --- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml +++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml @@ -9,11 +9,13 @@ NMDeviceInfiniband + + diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml index 259db939..e41c07ec 100644 --- a/docs/libnm-glib/tmpl/nm-device-modem.sgml +++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml @@ -9,11 +9,13 @@ NMDeviceModem + + diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml index a604a43a..20c63328 100644 --- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml +++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml @@ -9,11 +9,13 @@ NMDeviceOlpcMesh + + diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml index 5a58b7b2..30d839e0 100644 --- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml +++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml @@ -9,11 +9,13 @@ NMDeviceVlan + + diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml index 89ead82a..f5d42c19 100644 --- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml +++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml @@ -9,11 +9,13 @@ NMDeviceWifi + + diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml index 8d23e4da..d23d0231 100644 --- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml +++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml @@ -9,11 +9,13 @@ NMDeviceWimax + + diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml index 68df46f9..90be4054 100644 --- a/docs/libnm-glib/tmpl/nm-device.sgml +++ b/docs/libnm-glib/tmpl/nm-device.sgml @@ -9,11 +9,13 @@ NMDevice + + diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml index 752a8b2c..cef5854d 100644 --- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml +++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml @@ -9,11 +9,13 @@ NMDHCP4Config + + diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml index d01ac192..2c113261 100644 --- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml +++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml @@ -9,11 +9,13 @@ NMDHCP6Config + + diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml index a60db68e..b81a00af 100644 --- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml +++ b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml @@ -9,11 +9,13 @@ nm-glib-enum-types + + diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml index dbe72434..2f3b0280 100644 --- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml +++ b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml @@ -9,11 +9,13 @@ nm-glib-marshal + + diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml index 0e33ca0b..e015c2af 100644 --- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml +++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml @@ -9,11 +9,13 @@ NMIP4Config + + diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml index f2e66b71..f098e022 100644 --- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml +++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml @@ -9,11 +9,13 @@ NMIP6Config + + diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml index aaf91b49..93b2441e 100644 --- a/docs/libnm-glib/tmpl/nm-object.sgml +++ b/docs/libnm-glib/tmpl/nm-object.sgml @@ -9,11 +9,13 @@ NMObject + + diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml index 594371fd..628000c8 100644 --- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml @@ -9,11 +9,13 @@ NMRemoteConnection + + diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml index 3f24a06c..44b4d4fb 100644 --- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml +++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml @@ -9,11 +9,13 @@ NMRemoteSettings + + diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml index 428b7afd..9d23cbc5 100644 --- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml +++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml @@ -9,11 +9,13 @@ NMSecretAgent + + diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml index 1469192e..18babb0f 100644 --- a/docs/libnm-glib/tmpl/nm-types.sgml +++ b/docs/libnm-glib/tmpl/nm-types.sgml @@ -9,11 +9,13 @@ nm-types + + diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml index fe3dcbe0..3086909a 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml @@ -9,11 +9,13 @@ NMVPNConnection + + diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml index 83b976cd..0f800cac 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml @@ -9,11 +9,13 @@ nm-vpn-enum-types + + diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml index cf000cae..d8b74774 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml @@ -9,11 +9,13 @@ NMVpnPluginUiWidget + + @@ -83,6 +85,13 @@ NMVpnPluginUiWidget + + + + + + + diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml index a35e6a9a..ed0ab40b 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml @@ -9,11 +9,13 @@ nm-vpn-plugin-utils + + diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml index c04eb296..7ece0f79 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml @@ -9,11 +9,13 @@ NMVPNPlugin + + diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml index 4dd298b7..f5dca7a3 100644 --- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml +++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml @@ -9,11 +9,13 @@ NMWimaxNsp + + diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index de0a694a..2d444e76 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,11 +60,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -434,6 +434,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -503,10 +504,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index 339919d2..f83cfc86 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -59,11 +59,6 @@ enum NM_SETTING_CONNECTION_TYPE #define NM_SETTING_CONNECTION_UUID #define NM_SETTING_CONNECTION_ZONE -#define NM_SETTING_CONNECTION_ZONE_BLOCK -#define NM_SETTING_CONNECTION_ZONE_HOME -#define NM_SETTING_CONNECTION_ZONE_PUBLIC -#define NM_SETTING_CONNECTION_ZONE_TRUSTED -#define NM_SETTING_CONNECTION_ZONE_WORK gboolean nm_setting_connection_add_permission (NMSettingConnection *setting, const char *ptype, @@ -312,46 +307,6 @@ Describes errors that may result from operations involving a
-

NM_SETTING_CONNECTION_ZONE_BLOCK

-
#define NM_SETTING_CONNECTION_ZONE_BLOCK     "block"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_HOME

-
#define NM_SETTING_CONNECTION_ZONE_HOME      "home"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_PUBLIC

-
#define NM_SETTING_CONNECTION_ZONE_PUBLIC    "public"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_TRUSTED

-
#define NM_SETTING_CONNECTION_ZONE_TRUSTED   "trusted"
-
-

-

-
-
-
-

NM_SETTING_CONNECTION_ZONE_WORK

-
#define NM_SETTING_CONNECTION_ZONE_WORK      "work"
-
-

-

-
-
-

nm_setting_connection_add_permission ()

gboolean            nm_setting_connection_add_permission
                                                         (NMSettingConnection *setting,
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 7ceff0ba..053cb332 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2261,26 +2261,6 @@ NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
 
 

 

-NM_SETTING_CONNECTION_ZONE_BLOCK, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_HOME, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_PUBLIC, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_TRUSTED, macro in NMSettingConnection
-

-

-

-NM_SETTING_CONNECTION_ZONE_WORK, macro in NMSettingConnection
-

-

-

 nm_setting_diff, function in NMSetting
 

 

@@ -3858,6 +3838,10 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

+nm_utils_file_is_pkcs12, function in nm-utils
+

+

+

 nm_utils_gvalue_hash_dup, function in nm-utils
 

 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 1cddc6b2..39768bae 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference
NMConnection — Describes a connection to specific network or provider diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index c2b27338..e8f2d4ea 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -161,11 +161,6 @@ - - - - - @@ -1261,6 +1256,7 @@ + diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index a4404b33..92edd6e8 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -47,6 +47,7 @@ enum void nm_utils_deinit (void); const char * nm_utils_escape_ssid (const guint8 *ssid, guint32 len); +gboolean nm_utils_file_is_pkcs12 (const char *filename); GHashTable * nm_utils_gvalue_hash_dup (GHashTable *hash); GByteArray * nm_utils_hwaddr_atoba (const char *asc, int type); @@ -250,6 +251,27 @@ and will be overwritten by subsequent calls to this function
+

nm_utils_file_is_pkcs12 ()

+
gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+

+Utility function to find out if the filename is in PKCS12 format. +

+
++ + + + + + + + + + +

filename :

name of the file to test

Returns :

TRUE if the file is PKCS12, FALSE if it is not
+
+
+

nm_utils_gvalue_hash_dup ()

GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index fb3955a3..93646eec 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -135,11 +135,6 @@ - - - - - @@ -956,6 +951,7 @@ + diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt index c55c690f..dceb61b7 100644 --- a/docs/libnm-util/libnm-util-sections.txt +++ b/docs/libnm-util/libnm-util-sections.txt @@ -374,11 +374,6 @@ NM_SETTING_CONNECTION_TIMESTAMP NM_SETTING_CONNECTION_TYPE NM_SETTING_CONNECTION_UUID NM_SETTING_CONNECTION_ZONE -NM_SETTING_CONNECTION_ZONE_BLOCK -NM_SETTING_CONNECTION_ZONE_HOME -NM_SETTING_CONNECTION_ZONE_PUBLIC -NM_SETTING_CONNECTION_ZONE_TRUSTED -NM_SETTING_CONNECTION_ZONE_WORK nm_setting_connection_add_permission nm_setting_connection_error_quark nm_setting_connection_get_autoconnect @@ -1074,6 +1069,7 @@ NMUtilsSecurityType NM_UTILS_HWADDR_LEN_MAX nm_utils_deinit nm_utils_escape_ssid +nm_utils_file_is_pkcs12 nm_utils_gvalue_hash_dup nm_utils_hwaddr_atoba nm_utils_hwaddr_aton diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml index cee42ea4..751b1a19 100644 --- a/docs/libnm-util/tmpl/nm-setting-connection.sgml +++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml @@ -182,41 +182,6 @@ NMSettingConnection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml index 9195b502..f7ee74c1 100644 --- a/docs/libnm-util/tmpl/nm-utils.sgml +++ b/docs/libnm-util/tmpl/nm-utils.sgml @@ -60,6 +60,15 @@ nm-utils @Returns: + + + + + +@filename: +@Returns: + + -- cgit 1.3.0-6-gf8a5