From 9f806e97a24bba61417ae312fcc0da40914266fb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 4 May 2011 21:35:41 +0200 Subject: Imported Upstream version 0.8.999 --- docs/Makefile.am | 46 +- docs/Makefile.in | 236 +-- docs/api/Makefile.am | 88 + docs/api/Makefile.in | 941 +++++++++ docs/api/NetworkManager-overrides.txt | 0 docs/api/NetworkManager-sections.txt | 0 docs/api/generate-settings-spec.c | 227 +++ docs/api/html/NetworkManager.devhelp | 30 + docs/api/html/NetworkManager.devhelp2 | 30 + docs/api/html/home.png | Bin 0 -> 654 bytes docs/api/html/index.html | 93 + docs/api/html/ix01.html | 31 + docs/api/html/left.png | Bin 0 -> 459 bytes docs/api/html/license.html | 385 ++++ docs/api/html/ref-dbus.html | 35 + docs/api/html/ref-migrating.html | 539 ++++++ docs/api/html/ref-settings.html | 1337 +++++++++++++ docs/api/html/right.png | Bin 0 -> 472 bytes docs/api/html/secrets-flags.html | 64 + docs/api/html/spec.html | 1390 ++++++++++++++ docs/api/html/style.css | 266 +++ docs/api/html/up.png | Bin 0 -> 406 bytes docs/api/migrating-to-09.xml | 476 +++++ docs/api/network-manager-docs.xml | 129 ++ docs/api/settings-spec.xml | 1202 ++++++++++++ docs/api/spec.html | 1390 ++++++++++++++ docs/api/version.xml | 1 + docs/api/version.xml.in | 1 + docs/generate-settings-spec.c | 196 -- docs/libnm-glib/Makefile.am | 12 +- docs/libnm-glib/Makefile.in | 179 +- docs/libnm-glib/html/NMAccessPoint.html | 268 ++- docs/libnm-glib/html/NMActiveConnection.html | 171 +- docs/libnm-glib/html/NMCdmaDevice.html | 124 -- docs/libnm-glib/html/NMClient.html | 523 +++-- docs/libnm-glib/html/NMDHCP4Config.html | 57 +- docs/libnm-glib/html/NMDHCP6Config.html | 61 +- docs/libnm-glib/html/NMDevice.html | 383 ++-- docs/libnm-glib/html/NMDeviceBt.html | 69 +- docs/libnm-glib/html/NMDeviceEthernet.html | 74 +- docs/libnm-glib/html/NMDeviceModem.html | 198 ++ docs/libnm-glib/html/NMDeviceWifi.html | 164 +- docs/libnm-glib/html/NMDeviceWimax.html | 564 ++++++ docs/libnm-glib/html/NMExportedConnection.html | 139 -- docs/libnm-glib/html/NMGsmDevice.html | 124 -- docs/libnm-glib/html/NMIP4Config.html | 139 +- docs/libnm-glib/html/NMIP6Config.html | 97 +- docs/libnm-glib/html/NMObject.html | 50 +- docs/libnm-glib/html/NMRemoteConnection.html | 303 ++- docs/libnm-glib/html/NMRemoteSettings.html | 480 ++++- docs/libnm-glib/html/NMSecretAgent.html | 593 ++++++ docs/libnm-glib/html/NMSerialDevice.html | 192 -- docs/libnm-glib/html/NMVPNConnection.html | 115 +- docs/libnm-glib/html/NMWimaxNsp.html | 318 ++++ docs/libnm-glib/html/annotation-glossary.html | 86 + docs/libnm-glib/html/api-index-full.html | 1989 ++++++++++++++++++++ docs/libnm-glib/html/ch01.html | 113 -- docs/libnm-glib/html/ch02.html | 98 + docs/libnm-glib/html/index.html | 83 +- docs/libnm-glib/html/index.sgml | 310 +-- .../html/libnm-glib-NMRemoteSettingsSystem.html | 108 -- docs/libnm-glib/html/libnm-glib-NMSettings.html | 310 --- .../html/libnm-glib-NMSettingsConnection.html | 375 ---- .../html/libnm-glib-NMSettingsService.html | 189 -- .../html/libnm-glib-NMSettingsSystem.html | 305 --- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 174 +- docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 608 ++---- docs/libnm-glib/html/libnm-glib-nm-types.html | 108 +- docs/libnm-glib/html/libnm-glib.devhelp | 228 ++- docs/libnm-glib/html/libnm-glib.devhelp2 | 234 ++- docs/libnm-glib/html/libnm-glib.png | Bin 0 -> 82140 bytes docs/libnm-glib/html/object-tree.html | 53 + docs/libnm-glib/html/ref-overview.html | 47 + docs/libnm-glib/html/style.css | 3 +- docs/libnm-glib/libnm-glib-docs.sgml | 44 - docs/libnm-glib/libnm-glib-docs.xml | 118 ++ docs/libnm-glib/libnm-glib-sections.txt | 896 ++++----- docs/libnm-glib/libnm-glib.types | 40 - docs/libnm-glib/tmpl/libnm-glib-unused.sgml | 0 docs/libnm-glib/tmpl/nm-access-point.sgml | 242 --- docs/libnm-glib/tmpl/nm-active-connection.sgml | 209 -- docs/libnm-glib/tmpl/nm-cdma-device.sgml | 53 - docs/libnm-glib/tmpl/nm-client.sgml | 367 ---- docs/libnm-glib/tmpl/nm-device-bt.sgml | 116 -- docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 137 -- docs/libnm-glib/tmpl/nm-device-wifi.sgml | 216 --- docs/libnm-glib/tmpl/nm-device.sgml | 378 ---- docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 84 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 84 - docs/libnm-glib/tmpl/nm-exported-connection.sgml | 56 - docs/libnm-glib/tmpl/nm-gsm-device.sgml | 53 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 179 -- docs/libnm-glib/tmpl/nm-ip6-config.sgml | 137 -- docs/libnm-glib/tmpl/nm-object.sgml | 85 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 64 - .../libnm-glib/tmpl/nm-remote-settings-system.sgml | 53 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 89 - docs/libnm-glib/tmpl/nm-serial-device.sgml | 71 - .../tmpl/nm-settings-connection-interface.sgml | 119 -- docs/libnm-glib/tmpl/nm-settings-interface.sgml | 130 -- docs/libnm-glib/tmpl/nm-settings-service.sgml | 87 - .../tmpl/nm-settings-system-interface.sgml | 125 -- docs/libnm-glib/tmpl/nm-types.sgml | 136 -- docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 105 -- .../tmpl/nm-vpn-plugin-ui-interface.sgml | 259 --- docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 177 -- docs/libnm-util/Makefile.in | 167 +- docs/libnm-util/html/NMConnection.html | 1062 ----------- docs/libnm-util/html/NMSetting.html | 381 ++-- docs/libnm-util/html/NMSetting8021x.html | 1592 ++++++---------- docs/libnm-util/html/NMSettingBluetooth.html | 114 +- docs/libnm-util/html/NMSettingCdma.html | 132 +- docs/libnm-util/html/NMSettingConnection.html | 336 +++- docs/libnm-util/html/NMSettingGsm.html | 417 ++-- docs/libnm-util/html/NMSettingIP4Config.html | 1142 ++--------- docs/libnm-util/html/NMSettingIP6Config.html | 1097 ++--------- docs/libnm-util/html/NMSettingOlpcMesh.html | 126 +- docs/libnm-util/html/NMSettingPPP.html | 446 +---- docs/libnm-util/html/NMSettingPPPOE.html | 154 +- docs/libnm-util/html/NMSettingSerial.html | 173 +- docs/libnm-util/html/NMSettingVPN.html | 294 +-- docs/libnm-util/html/NMSettingWired.html | 320 +--- docs/libnm-util/html/NMSettingWireless.html | 444 +---- .../libnm-util/html/NMSettingWirelessSecurity.html | 613 ++---- docs/libnm-util/html/annotation-glossary.html | 43 +- docs/libnm-util/html/api-index-full.html | 490 +++-- docs/libnm-util/html/ch01.html | 16 +- docs/libnm-util/html/index.html | 13 +- docs/libnm-util/html/index.sgml | 184 +- docs/libnm-util/html/libnm-util-nm-utils.html | 535 ++---- docs/libnm-util/html/libnm-util.devhelp | 129 +- docs/libnm-util/html/libnm-util.devhelp2 | 148 +- docs/libnm-util/html/object-tree.html | 33 +- docs/libnm-util/html/style.css | 3 +- docs/libnm-util/libnm-util-docs.sgml | 4 +- docs/libnm-util/libnm-util-sections.txt | 1268 +++++++------ docs/libnm-util/libnm-util.types | 34 - docs/libnm-util/tmpl/libnm-util-unused.sgml | 0 docs/libnm-util/tmpl/nm-connection.sgml | 349 ---- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 968 ---------- docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 155 -- docs/libnm-util/tmpl/nm-setting-cdma.sgml | 162 -- docs/libnm-util/tmpl/nm-setting-connection.sgml | 225 --- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 396 ---- docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 760 -------- docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 704 ------- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 161 -- docs/libnm-util/tmpl/nm-setting-ppp.sgml | 477 ----- docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 162 -- docs/libnm-util/tmpl/nm-setting-serial.sgml | 204 -- docs/libnm-util/tmpl/nm-setting-vpn.sgml | 252 --- docs/libnm-util/tmpl/nm-setting-wired.sgml | 351 ---- .../tmpl/nm-setting-wireless-security.sgml | 501 ----- docs/libnm-util/tmpl/nm-setting-wireless.sgml | 386 ---- docs/libnm-util/tmpl/nm-setting.sgml | 276 --- docs/libnm-util/tmpl/nm-utils.sgml | 404 ---- docs/settings-spec.html | 993 ---------- docs/spec.html | 1210 ------------ 158 files changed, 19835 insertions(+), 26031 deletions(-) create mode 100644 docs/api/Makefile.am create mode 100644 docs/api/Makefile.in create mode 100644 docs/api/NetworkManager-overrides.txt create mode 100644 docs/api/NetworkManager-sections.txt create mode 100644 docs/api/generate-settings-spec.c create mode 100644 docs/api/html/NetworkManager.devhelp create mode 100644 docs/api/html/NetworkManager.devhelp2 create mode 100644 docs/api/html/home.png create mode 100644 docs/api/html/index.html create mode 100644 docs/api/html/ix01.html create mode 100644 docs/api/html/left.png create mode 100644 docs/api/html/license.html create mode 100644 docs/api/html/ref-dbus.html create mode 100644 docs/api/html/ref-migrating.html create mode 100644 docs/api/html/ref-settings.html create mode 100644 docs/api/html/right.png create mode 100644 docs/api/html/secrets-flags.html create mode 100644 docs/api/html/spec.html create mode 100644 docs/api/html/style.css create mode 100644 docs/api/html/up.png create mode 100644 docs/api/migrating-to-09.xml create mode 100644 docs/api/network-manager-docs.xml create mode 100644 docs/api/settings-spec.xml create mode 100644 docs/api/spec.html create mode 100644 docs/api/version.xml create mode 100644 docs/api/version.xml.in delete mode 100644 docs/generate-settings-spec.c delete mode 100644 docs/libnm-glib/html/NMCdmaDevice.html create mode 100644 docs/libnm-glib/html/NMDeviceModem.html create mode 100644 docs/libnm-glib/html/NMDeviceWimax.html delete mode 100644 docs/libnm-glib/html/NMExportedConnection.html delete mode 100644 docs/libnm-glib/html/NMGsmDevice.html create mode 100644 docs/libnm-glib/html/NMSecretAgent.html delete mode 100644 docs/libnm-glib/html/NMSerialDevice.html create mode 100644 docs/libnm-glib/html/NMWimaxNsp.html create mode 100644 docs/libnm-glib/html/annotation-glossary.html create mode 100644 docs/libnm-glib/html/api-index-full.html delete mode 100644 docs/libnm-glib/html/ch01.html create mode 100644 docs/libnm-glib/html/ch02.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMSettings.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMSettingsService.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html create mode 100644 docs/libnm-glib/html/libnm-glib.png create mode 100644 docs/libnm-glib/html/object-tree.html create mode 100644 docs/libnm-glib/html/ref-overview.html delete mode 100644 docs/libnm-glib/libnm-glib-docs.sgml create mode 100644 docs/libnm-glib/libnm-glib-docs.xml delete mode 100644 docs/libnm-glib/libnm-glib.types delete mode 100644 docs/libnm-glib/tmpl/libnm-glib-unused.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-access-point.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-active-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-cdma-device.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-client.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-bt.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-ethernet.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-wifi.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-dhcp4-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-dhcp6-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-exported-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-gsm-device.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-ip4-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-ip6-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-object.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-remote-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-remote-settings-system.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-remote-settings.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-serial-device.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-settings-interface.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-settings-service.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-settings-system-interface.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-types.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin.sgml delete mode 100644 docs/libnm-util/html/NMConnection.html delete mode 100644 docs/libnm-util/libnm-util.types delete mode 100644 docs/libnm-util/tmpl/libnm-util-unused.sgml delete mode 100644 docs/libnm-util/tmpl/nm-connection.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-8021x.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-bluetooth.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-cdma.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-connection.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-gsm.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip4-config.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ppp.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-pppoe.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-serial.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-vpn.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wired.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless-security.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting.sgml delete mode 100644 docs/libnm-util/tmpl/nm-utils.sgml delete mode 100644 docs/settings-spec.html delete mode 100644 docs/spec.html (limited to 'docs') diff --git a/docs/Makefile.am b/docs/Makefile.am index 5a3da7e0..a1d1b9b3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,50 +1,6 @@ if WITH_DOCS -SUBDIRS = libnm-glib libnm-util - -INCLUDES = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/libnm-util - -noinst_PROGRAMS = \ - generate-settings-spec - -generate_settings_spec_SOURCES = \ - generate-settings-spec.c - -generate_settings_spec_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - -generate_settings_spec_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -XSLTPROC = xsltproc --xinclude --nonet -XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) - -OTHER_FILES= \ - $(top_srcdir)/introspection/all.xml \ - $(top_srcdir)/introspection/generic-types.xml \ - $(top_srcdir)/introspection/errors.xml \ - $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/tools/doc-generator.xsl \ - $(top_srcdir)/introspection/generic-types.xml - -GENERATED_FILES = spec.html settings-spec.html - -spec.html: $(XMLS) $(OTHER_FILES) - $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@ - -settings-spec.html: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la - $(builddir)/generate-settings-spec $(builddir)/settings-spec.html - -all: $(GENERATED_FILES) - -EXTRA_DIST = $(GENERATED_FILES) - -CLEANFILES = $(GENERATED_FILES) +SUBDIRS = api libnm-glib libnm-util endif diff --git a/docs/Makefile.in b/docs/Makefile.in index 59da07ac..91ce98e5 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -14,7 +14,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -34,61 +33,34 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WITH_DOCS_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac 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_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am__generate_settings_spec_SOURCES_DIST = generate-settings-spec.c -@WITH_DOCS_TRUE@am_generate_settings_spec_OBJECTS = generate_settings_spec-generate-settings-spec.$(OBJEXT) -generate_settings_spec_OBJECTS = $(am_generate_settings_spec_OBJECTS) -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_0 = --silent -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -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_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -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_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(generate_settings_spec_SOURCES) -DIST_SOURCES = $(am__generate_settings_spec_SOURCES_DIST) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -103,7 +75,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = libnm-glib libnm-util +DIST_SUBDIRS = api libnm-glib libnm-util DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -131,7 +103,6 @@ am__relativize = \ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -140,13 +111,15 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ 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@ @@ -158,6 +131,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -166,6 +140,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -174,8 +149,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ @@ -190,13 +165,23 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ +IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -204,6 +189,8 @@ LIBDL = @LIBDL@ LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ @@ -212,13 +199,15 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -244,13 +233,12 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ +QT_CFLAGS = @QT_CFLAGS@ +QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ @@ -264,11 +252,15 @@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ 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@ @@ -316,40 +308,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_DOCS_TRUE@SUBDIRS = libnm-glib libnm-util -@WITH_DOCS_TRUE@INCLUDES = \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/include \ -@WITH_DOCS_TRUE@ -I$(top_srcdir)/libnm-util - -@WITH_DOCS_TRUE@generate_settings_spec_SOURCES = \ -@WITH_DOCS_TRUE@ generate-settings-spec.c - -@WITH_DOCS_TRUE@generate_settings_spec_CPPFLAGS = \ -@WITH_DOCS_TRUE@ $(GLIB_CFLAGS) \ -@WITH_DOCS_TRUE@ $(DBUS_CFLAGS) - -@WITH_DOCS_TRUE@generate_settings_spec_LDADD = \ -@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ -@WITH_DOCS_TRUE@ $(GLIB_LIBS) \ -@WITH_DOCS_TRUE@ $(DBUS_LIBS) - -@WITH_DOCS_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@WITH_DOCS_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -@WITH_DOCS_TRUE@OTHER_FILES = \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/all.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ -@WITH_DOCS_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ -@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml - -@WITH_DOCS_TRUE@GENERATED_FILES = spec.html settings-spec.html -@WITH_DOCS_TRUE@EXTRA_DIST = $(GENERATED_FILES) -@WITH_DOCS_TRUE@CLEANFILES = $(GENERATED_FILES) +@WITH_DOCS_TRUE@SUBDIRS = api libnm-glib libnm-util all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -381,69 +343,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - 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) - @rm -f generate-settings-spec$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(generate_settings_spec_OBJECTS) $(generate_settings_spec_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate_settings_spec-generate-settings-spec.Po@am__quote@ - -.c.o: -@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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(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@ 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 - -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@ 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` - mostlyclean-libtool: -rm -f *.lo @@ -645,7 +544,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -665,7 +564,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -676,14 +574,11 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -726,14 +621,12 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-recursive @@ -750,28 +643,19 @@ uninstall-am: .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am -@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) -@WITH_DOCS_TRUE@ $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@ - -@WITH_DOCS_TRUE@settings-spec.html: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la -@WITH_DOCS_TRUE@ $(builddir)/generate-settings-spec $(builddir)/settings-spec.html - -@WITH_DOCS_TRUE@all: $(GENERATED_FILES) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am new file mode 100644 index 00000000..687d9cfb --- /dev/null +++ b/docs/api/Makefile.am @@ -0,0 +1,88 @@ +GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c + +AUTOMAKE_OPTIONS = 1.7 + +if WITH_DOCS + +INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-util + +noinst_PROGRAMS = \ + generate-settings-spec + +generate_settings_spec_SOURCES = \ + $(GENERATE_SETTINGS_SPEC_SOURCE) + +generate_settings_spec_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +generate_settings_spec_LDADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) + +XSLTPROC = xsltproc --xinclude --nonet +XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) + +OTHER_FILES= \ + $(top_srcdir)/introspection/all.xml \ + $(top_srcdir)/introspection/generic-types.xml \ + $(top_srcdir)/introspection/errors.xml \ + $(top_srcdir)/introspection/vpn-errors.xml \ + $(top_srcdir)/tools/doc-generator.xsl \ + $(top_srcdir)/introspection/generic-types.xml + +GENERATED_FILES = spec.html settings-spec.xml + +spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp + $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@ + mkdir -p $(builddir)/html/ + cp $@ $(builddir)/html/ + +settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la + rm -f $(builddir)/$@ + $(builddir)/generate-settings-spec $(builddir)/$@ + +all: $(GENERATED_FILES) + +#################################### + +# The name of the module. +DOC_MODULE=NetworkManager + +# The top-level SGML file. +DOC_MAIN_SGML_FILE=network-manager-docs.xml + +# Extra options to supply to gtkdoc-mkdb +MKDB_OPTIONS=--sgml-mode --output-format=xml + +# Extra options to supply to gtkdoc-mktmpl +MKTMPL_OPTIONS= + +# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) +content_files = \ + version.xml \ + settings-spec.xml \ + migrating-to-09.xml \ + $(NULL) + +include $(top_srcdir)/gtk-doc.make + +#################################### + +EXTRA_DIST += $(GENERATED_FILES) +CLEANFILES += $(GENERATED_FILES) + +else + +EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) +CLEANFILES = + +endif + +EXTRA_DIST += version.xml.in + +CLEANFILES += html/* tmpl/* xml/* + diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in new file mode 100644 index 00000000..ec3fb8a2 --- /dev/null +++ b/docs/api/Makefile.in @@ -0,0 +1,941 @@ +# Makefile.in generated by automake 1.11.1 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. +# 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@WITH_DOCS_TRUE@noinst_PROGRAMS = generate-settings-spec$(EXEEXT) +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +subdir = docs/api +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 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = version.xml +CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) +am__generate_settings_spec_SOURCES_DIST = generate-settings-spec.c +am__objects_1 = \ + generate_settings_spec-generate-settings-spec.$(OBJEXT) +@WITH_DOCS_TRUE@am_generate_settings_spec_OBJECTS = $(am__objects_1) +generate_settings_spec_OBJECTS = $(am_generate_settings_spec_OBJECTS) +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_0 = --silent +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +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_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +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_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(generate_settings_spec_SOURCES) +DIST_SOURCES = $(am__generate_settings_spec_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +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@ +DBUS_LIBS = @DBUS_LIBS@ +DBUS_SYS_DIR = @DBUS_SYS_DIR@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DHCLIENT_PATH = @DHCLIENT_PATH@ +DHCLIENT_VERSION = @DHCLIENT_VERSION@ +DHCPCD_PATH = @DHCPCD_PATH@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ +GNUTLS_LIBS = @GNUTLS_LIBS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GUDEV_CFLAGS = @GUDEV_CFLAGS@ +GUDEV_LIBS = @GUDEV_LIBS@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +IPTABLES_PATH = @IPTABLES_PATH@ +IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ +IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ +KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBDL = @LIBDL@ +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBM = @LIBM@ +LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_LIBS = @LIBNL_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ +NM_MICRO_VERSION = @NM_MICRO_VERSION@ +NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_VERSION = @NM_VERSION@ +NSS_CFLAGS = @NSS_CFLAGS@ +NSS_LIBS = @NSS_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_PATH = @PKGCONFIG_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +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@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ +UDEV_BASE_DIR = @UDEV_BASE_DIR@ +USE_NLS = @USE_NLS@ +UUID_CFLAGS = @UUID_CFLAGS@ +UUID_LIBS = @UUID_LIBS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +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@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c +AUTOMAKE_OPTIONS = 1.7 +@WITH_DOCS_TRUE@INCLUDES = \ +@WITH_DOCS_TRUE@ -I$(top_srcdir)/include \ +@WITH_DOCS_TRUE@ -I$(top_srcdir)/libnm-util + +@WITH_DOCS_TRUE@generate_settings_spec_SOURCES = \ +@WITH_DOCS_TRUE@ $(GENERATE_SETTINGS_SPEC_SOURCE) + +@WITH_DOCS_TRUE@generate_settings_spec_CPPFLAGS = \ +@WITH_DOCS_TRUE@ $(GLIB_CFLAGS) \ +@WITH_DOCS_TRUE@ $(DBUS_CFLAGS) + +@WITH_DOCS_TRUE@generate_settings_spec_LDADD = \ +@WITH_DOCS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ +@WITH_DOCS_TRUE@ $(GLIB_LIBS) \ +@WITH_DOCS_TRUE@ $(DBUS_LIBS) + +@WITH_DOCS_TRUE@XSLTPROC = xsltproc --xinclude --nonet +@WITH_DOCS_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) +@WITH_DOCS_TRUE@OTHER_FILES = \ +@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/all.xml \ +@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ +@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/errors.xml \ +@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ +@WITH_DOCS_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ +@WITH_DOCS_TRUE@ $(top_srcdir)/introspection/generic-types.xml + +@WITH_DOCS_TRUE@GENERATED_FILES = spec.html settings-spec.xml + +#################################### + +# The name of the module. +@WITH_DOCS_TRUE@DOC_MODULE = NetworkManager + +# The top-level SGML file. +@WITH_DOCS_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml + +# Extra options to supply to gtkdoc-mkdb +@WITH_DOCS_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml + +# Extra options to supply to gtkdoc-mktmpl +@WITH_DOCS_TRUE@MKTMPL_OPTIONS = + +# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) +@WITH_DOCS_TRUE@content_files = \ +@WITH_DOCS_TRUE@ version.xml \ +@WITH_DOCS_TRUE@ settings-spec.xml \ +@WITH_DOCS_TRUE@ migrating-to-09.xml \ +@WITH_DOCS_TRUE@ $(NULL) + +@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +@WITH_DOCS_TRUE@GPATH = $(srcdir) +@WITH_DOCS_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +@WITH_DOCS_TRUE@SETUP_FILES = \ +@WITH_DOCS_TRUE@ $(content_files) \ +@WITH_DOCS_TRUE@ $(DOC_MAIN_SGML_FILE) \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-sections.txt \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-overrides.txt + +@WITH_DOCS_FALSE@EXTRA_DIST = $(GENERATE_SETTINGS_SPEC_SOURCE) \ +@WITH_DOCS_FALSE@ version.xml.in + +#################################### +@WITH_DOCS_TRUE@EXTRA_DIST = $(SETUP_FILES) $(GENERATED_FILES) \ +@WITH_DOCS_TRUE@ version.xml.in +@WITH_DOCS_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +@WITH_DOCS_TRUE@ html-build.stamp pdf-build.stamp \ +@WITH_DOCS_TRUE@ setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp + +@WITH_DOCS_TRUE@SCANOBJ_FILES = \ +@WITH_DOCS_TRUE@ $(DOC_MODULE).args \ +@WITH_DOCS_TRUE@ $(DOC_MODULE).hierarchy \ +@WITH_DOCS_TRUE@ $(DOC_MODULE).interfaces \ +@WITH_DOCS_TRUE@ $(DOC_MODULE).prerequisites \ +@WITH_DOCS_TRUE@ $(DOC_MODULE).signals + +@WITH_DOCS_TRUE@REPORT_FILES = \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-undocumented.txt \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-undeclared.txt \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-unused.txt + +@WITH_DOCS_FALSE@CLEANFILES = html/* tmpl/* xml/* +@WITH_DOCS_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ +@WITH_DOCS_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* tmpl/* \ +@WITH_DOCS_TRUE@ xml/* +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@@WITH_DOCS_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@@WITH_DOCS_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/api/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/api/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + 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) + @rm -f generate-settings-spec$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(generate_settings_spec_OBJECTS) $(generate_settings_spec_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate_settings_spec-generate-settings-spec.Po@am__quote@ + +.c.o: +@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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(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@ 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 + +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@ 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` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@WITH_DOCS_FALSE@dist-hook: + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +@WITH_DOCS_FALSE@all-local: +all-am: Makefile $(PROGRAMS) all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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 +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +@WITH_DOCS_FALSE@uninstall-local: +@WITH_DOCS_FALSE@distclean-local: +@WITH_DOCS_FALSE@install-data-local: +@WITH_DOCS_FALSE@maintainer-clean-local: +@WITH_DOCS_FALSE@clean-local: +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-local distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-local + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + ctags dist-hook distclean distclean-compile distclean-generic \ + distclean-libtool distclean-local distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-local + + +@WITH_DOCS_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp +@WITH_DOCS_TRUE@ $(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@ +@WITH_DOCS_TRUE@ mkdir -p $(builddir)/html/ +@WITH_DOCS_TRUE@ cp $@ $(builddir)/html/ + +@WITH_DOCS_TRUE@settings-spec.xml: generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la +@WITH_DOCS_TRUE@ rm -f $(builddir)/$@ +@WITH_DOCS_TRUE@ $(builddir)/generate-settings-spec $(builddir)/$@ + +@WITH_DOCS_TRUE@all: $(GENERATED_FILES) + +@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@all-local: + +@WITH_DOCS_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +@WITH_DOCS_TRUE@$(REPORT_FILES): sgml-build.stamp + +#### setup #### + +@WITH_DOCS_TRUE@setup-build.stamp: +@WITH_DOCS_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@WITH_DOCS_TRUE@ echo 'gtk-doc: Preparing build'; \ +@WITH_DOCS_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +@WITH_DOCS_TRUE@ if test "x$$files" != "x" ; then \ +@WITH_DOCS_TRUE@ for file in $$files ; do \ +@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/$$file && \ +@WITH_DOCS_TRUE@ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \ +@WITH_DOCS_TRUE@ done \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/tmpl && \ +@WITH_DOCS_TRUE@ cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +@WITH_DOCS_TRUE@ fi +@WITH_DOCS_TRUE@ @touch setup-build.stamp + +@WITH_DOCS_TRUE@setup.stamp: setup-build.stamp +@WITH_DOCS_TRUE@ @true + +#### scan #### + +@WITH_DOCS_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Scanning header files' +@WITH_DOCS_TRUE@ @_source_dir='' ; \ +@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@WITH_DOCS_TRUE@ done ; \ +@WITH_DOCS_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) +@WITH_DOCS_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ +@WITH_DOCS_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ +@WITH_DOCS_TRUE@ else \ +@WITH_DOCS_TRUE@ for i in $(SCANOBJ_FILES) ; do \ +@WITH_DOCS_TRUE@ test -f $$i || touch $$i ; \ +@WITH_DOCS_TRUE@ done \ +@WITH_DOCS_TRUE@ fi +@WITH_DOCS_TRUE@ @touch scan-build.stamp + +@WITH_DOCS_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp +@WITH_DOCS_TRUE@ @true + +#### templates #### + +@WITH_DOCS_TRUE@tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Rebuilding template files' +@WITH_DOCS_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@WITH_DOCS_TRUE@ if test -w $(abs_srcdir) ; then \ +@WITH_DOCS_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +@WITH_DOCS_TRUE@ fi \ +@WITH_DOCS_TRUE@ fi +@WITH_DOCS_TRUE@ @touch tmpl-build.stamp + +@WITH_DOCS_TRUE@tmpl.stamp: tmpl-build.stamp +@WITH_DOCS_TRUE@ @true + +@WITH_DOCS_TRUE@$(srcdir)/tmpl/*.sgml: +@WITH_DOCS_TRUE@ @true + +#### xml #### + +@WITH_DOCS_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building XML' +@WITH_DOCS_TRUE@ @-chmod -R u+w $(srcdir) +@WITH_DOCS_TRUE@ @_source_dir='' ; \ +@WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ +@WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ +@WITH_DOCS_TRUE@ done ; \ +@WITH_DOCS_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) +@WITH_DOCS_TRUE@ @touch sgml-build.stamp + +@WITH_DOCS_TRUE@sgml.stamp: sgml-build.stamp +@WITH_DOCS_TRUE@ @true + +#### html #### + +@WITH_DOCS_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building HTML' +@WITH_DOCS_TRUE@ @rm -rf html +@WITH_DOCS_TRUE@ @mkdir html +@WITH_DOCS_TRUE@ @mkhtml_options=""; \ +@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ +@WITH_DOCS_TRUE@ mkhtml_options=--path="$(abs_srcdir)"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +@WITH_DOCS_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ +@WITH_DOCS_TRUE@ for file in $(HTML_IMAGES) ; do \ +@WITH_DOCS_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ +@WITH_DOCS_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ if test -f $(abs_builddir)/$$file ; then \ +@WITH_DOCS_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ done; +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Fixing cross-references' +@WITH_DOCS_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@WITH_DOCS_TRUE@ @touch html-build.stamp + +#### pdf #### + +@WITH_DOCS_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building PDF' +@WITH_DOCS_TRUE@ @rm -rf $(DOC_MODULE).pdf +@WITH_DOCS_TRUE@ @mkpdf_imgdirs=""; \ +@WITH_DOCS_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ +@WITH_DOCS_TRUE@ for img in $(HTML_IMAGES); do \ +@WITH_DOCS_TRUE@ part=`dirname $$img`; \ +@WITH_DOCS_TRUE@ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +@WITH_DOCS_TRUE@ if test $$? != 0; then \ +@WITH_DOCS_TRUE@ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ done; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +@WITH_DOCS_TRUE@ @touch pdf-build.stamp + +############## + +@WITH_DOCS_TRUE@clean-local: +@WITH_DOCS_TRUE@ rm -f *~ *.bak +@WITH_DOCS_TRUE@ rm -rf .libs + +@WITH_DOCS_TRUE@distclean-local: +@WITH_DOCS_TRUE@ rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ +@WITH_DOCS_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt +@WITH_DOCS_TRUE@ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@WITH_DOCS_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ +@WITH_DOCS_TRUE@ rm -rf tmpl; \ +@WITH_DOCS_TRUE@ fi + +@WITH_DOCS_TRUE@maintainer-clean-local: clean +@WITH_DOCS_TRUE@ rm -rf xml html + +@WITH_DOCS_TRUE@install-data-local: +@WITH_DOCS_TRUE@ @installfiles=`echo $(srcdir)/html/*`; \ +@WITH_DOCS_TRUE@ if test "$$installfiles" = '$(srcdir)/html/*'; \ +@WITH_DOCS_TRUE@ then echo '-- Nothing to install' ; \ +@WITH_DOCS_TRUE@ else \ +@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@WITH_DOCS_TRUE@ else \ +@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ $(mkinstalldirs) $${installdir} ; \ +@WITH_DOCS_TRUE@ for i in $$installfiles; do \ +@WITH_DOCS_TRUE@ echo '-- Installing '$$i ; \ +@WITH_DOCS_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ +@WITH_DOCS_TRUE@ done; \ +@WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ +@WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +@WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +@WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ +@WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ +@WITH_DOCS_TRUE@ fi + +@WITH_DOCS_TRUE@uninstall-local: +@WITH_DOCS_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ +@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +@WITH_DOCS_TRUE@ else \ +@WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +@ENABLE_GTK_DOC_TRUE@@WITH_DOCS_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @false + +@WITH_DOCS_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local +@WITH_DOCS_TRUE@ mkdir $(distdir)/tmpl +@WITH_DOCS_TRUE@ mkdir $(distdir)/html +@WITH_DOCS_TRUE@ -cp $(build)/tmpl/*.sgml $(distdir)/tmpl +@WITH_DOCS_TRUE@ cp $(builddir)/html/* $(distdir)/html +@WITH_DOCS_TRUE@ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/ +@WITH_DOCS_TRUE@ -cp $(build)/$(DOC_MODULE).types $(distdir)/ +@WITH_DOCS_TRUE@ -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/ +@WITH_DOCS_TRUE@ cd $(distdir) && rm -f $(DISTCLEANFILES) +@WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +@WITH_DOCS_TRUE@.PHONY : dist-hook-local docs + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/docs/api/NetworkManager-overrides.txt b/docs/api/NetworkManager-overrides.txt new file mode 100644 index 00000000..e69de29b diff --git a/docs/api/NetworkManager-sections.txt b/docs/api/NetworkManager-sections.txt new file mode 100644 index 00000000..e69de29b diff --git a/docs/api/generate-settings-spec.c b/docs/api/generate-settings-spec.c new file mode 100644 index 00000000..9c15314f --- /dev/null +++ b/docs/api/generate-settings-spec.c @@ -0,0 +1,227 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * Dan Williams + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser 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. + * + * (C) Copyright 2009 - 2010 Red Hat, Inc. + */ + +#include +#include +#include +#include + +#include +#include +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +typedef NMSetting* (*SettingNewFunc) (void); + +static SettingNewFunc funcs[] = { + nm_setting_802_1x_new, + nm_setting_bluetooth_new, + nm_setting_cdma_new, + nm_setting_connection_new, + nm_setting_gsm_new, + nm_setting_ip4_config_new, + nm_setting_ip6_config_new, + nm_setting_olpc_mesh_new, + nm_setting_ppp_new, + nm_setting_pppoe_new, + nm_setting_serial_new, + nm_setting_vpn_new, + nm_setting_wimax_new, + nm_setting_wired_new, + nm_setting_wireless_new, + nm_setting_wireless_security_new, + NULL +}; + +typedef struct { + const char *gvalue_name; + const char *new_name; +} TypeNameElement; + +static TypeNameElement name_map[] = { + { "gchararray", "string" }, + { "GSList_gchararray_", "array of string" }, + { "GArray_guchar_", "byte array" }, + { "gboolean", "boolean" }, + { "guint64", "uint64" }, + { "gint", "int32" }, + { "guint", "uint32" }, + { "GArray_guint_", "array of uint32" }, + { "GPtrArray_GArray_guint__", "array of array of uint32" }, + { "GPtrArray_GArray_guchar__", "array of byte array" }, + { "GHashTable_gchararray+gchararray_", "dict of (string::string)" }, + { "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___", "array of (byte array, uint32, byte array)" }, + { "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__", "array of (byte array, uint32, byte array, uint32)" }, + { NULL, NULL } +}; + +static void +write_one_setting (FILE *f, SettingNewFunc func) +{ + NMSetting *s; + GParamSpec **props, **iter; + guint num; + + s = func (); + + /* write out section header */ + (void) fprintf (f, + "\n" + " %s setting\n" + " \n" + " \n" + " \n" + " Key Name\n" + " Value Type\n" + " Default Value\n" + " Value Description\n" + " \n" + " \n" + " \n", + nm_setting_get_name (s)); + + props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (s)), &num); + for (iter = props; iter && *iter; iter++) { + const char *key_name, *value_type, *value_desc; + char *default_value; + TypeNameElement *name_iter; + GValue value = { 0, }; + char *flags_str = NULL; + + value_type = g_type_name (G_PARAM_SPEC_VALUE_TYPE (*iter)); + for (name_iter = &name_map[0]; name_iter && name_iter->gvalue_name; name_iter++) { + if (!strcmp (value_type, name_iter->gvalue_name)) { + value_type = name_iter->new_name; + break; + } + } + + key_name = g_param_spec_get_name (*iter); + value_desc = g_param_spec_get_blurb (*iter); + + g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (*iter)); + g_param_value_set_default (*iter, &value); + default_value = g_strdup_value_contents (&value); + if (default_value && !strcmp (default_value, "NULL")) { + g_free (default_value); + default_value = NULL; + } + + if (!strcmp (key_name, NM_SETTING_NAME)) { + g_free (default_value); + default_value = NULL; + g_object_get (G_OBJECT (s), NM_SETTING_NAME, &default_value, NULL); + } + + if (g_str_has_suffix (key_name, "-flags")) + flags_str = g_strdup_printf (" (see for flag values)"); + + (void) fprintf (f, + " \n" + " %s\n" + " %s\n" + " %s\n" + " %s%s\n" + " \n", + key_name, + value_type, + default_value ? default_value : "", + value_desc, + flags_str ? flags_str : ""); + + g_free (flags_str); + g_free (default_value); + } + + (void) fprintf (f, + " \n" + " \n" + "
\n"); + + g_object_unref (s); +} + +int +main (int argc, char *argv[]) +{ + GError *error = NULL; + FILE *f; + SettingNewFunc *fptr; + + if (argc != 2) { + fprintf (stderr, "Usage: %s \n", argv[0]); + _exit (1); + } + + g_type_init (); + + if (!nm_utils_init (&error)) { + fprintf (stderr, "ERR: failed to initialize libnm-util: %s", error->message); + _exit (2); + } + + f = fopen (argv[1], "w"); + if (!f) { + fprintf (stderr, "ERR: could not create %s: %d\n", argv[1], errno); + _exit (3); + } + + (void) fprintf (f, + "\n" + "" + "]>" + "
\n" + " Configuration Settings\n" + " \n"); + + for (fptr = funcs; fptr && *fptr; fptr++) + write_one_setting (f, *fptr); + + (void) fprintf (f, + " \n" + "
\n"); + + fclose (f); + _exit (0); +} + diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp new file mode 100644 index 00000000..3954eb81 --- /dev/null +++ b/docs/api/html/NetworkManager.devhelp @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 new file mode 100644 index 00000000..5ca2e583 --- /dev/null +++ b/docs/api/html/NetworkManager.devhelp2 @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/home.png b/docs/api/html/home.png new file mode 100644 index 00000000..17003611 Binary files /dev/null and b/docs/api/html/home.png differ diff --git a/docs/api/html/index.html b/docs/api/html/index.html new file mode 100644 index 00000000..392f24f2 --- /dev/null +++ b/docs/api/html/index.html @@ -0,0 +1,93 @@ + + + + +NetworkManager D-Bus Reference Manual + + + + + + + +
+
+
+
+
+

+Dan Williams +

+


+     
+   

+
+

Version 0.8.999 +

+

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 + version published by the Free Software Foundation with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. You may obtain a copy of the GNU Free + Documentation License from the Free Software + Foundation by visiting their Web site or by writing + to: + +

+


+   The Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307,
+   USA
+

+

+

+

+ Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and those trademarks + are made aware to the members of the GNOME Documentation + Project, the names have been printed in caps or initial caps. +

+
+
+
+
+
+
D-Bus API Reference
+
Network Configuration Setting Specification
+
+
Configuration Settings
+
Secret flag types
+
+
Migrating from NetworkManager 0.8 to NetworkManager 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
+
+
+
Index
+
A. License
+
+
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html new file mode 100644 index 00000000..f5efded9 --- /dev/null +++ b/docs/api/html/ix01.html @@ -0,0 +1,31 @@ + + + + +Index + + + + + + + + + + + + + + + + +
+

+Index

+
+
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/api/html/left.png b/docs/api/html/left.png new file mode 100644 index 00000000..2d05b3d5 Binary files /dev/null and b/docs/api/html/left.png differ diff --git a/docs/api/html/license.html b/docs/api/html/license.html new file mode 100644 index 00000000..fc0b0a38 --- /dev/null +++ b/docs/api/html/license.html @@ -0,0 +1,385 @@ + + + + +Appendix A. License + + + + + + + + + + + + + + + +
+

+Appendix A. License

+

+

+
Unless a COPYING file in a subdirectory or file-specific license headers
+specify a different license, the following applies to all files in this
+directory and all subdirectories.
+
+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.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+

+

+
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html new file mode 100644 index 00000000..29392bed --- /dev/null +++ b/docs/api/html/ref-dbus.html @@ -0,0 +1,35 @@ + + + + +D-Bus API Reference + + + + + + + + + + + + + + + + +
+

+D-Bus API Reference

+

+ This part documents the D-Bus interface used to access the + NetworkManager daemon. +

+spec.html +
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html new file mode 100644 index 00000000..8798b9a4 --- /dev/null +++ b/docs/api/html/ref-migrating.html @@ -0,0 +1,539 @@ + + + + +Migrating from NetworkManager 0.8 to NetworkManager 0.9 + + + + + + + + + + + + + + + + +
+

+Migrating from NetworkManager 0.8 to NetworkManager 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
+
+
+

+ NetworkManager 0.9 is a new major version of NetworkManager that breaks + both API and ABI compared to previous versions. These changes are + intended to make communication with NetworkManager much simpler, especially + for network control and configuration programs. Thankfully, most changes + are not difficult to implement, and the advantages of the simpler + architecture of NetworkManager 0.9 greatly outweight the effort of + updating client programs. +

+
+

+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

+

+ Previously there were two "settings services", or D-Bus services that + provided and saved network configuration information. NetworkManager + owned the "system" settings service, and one user-level applet owned the + "user" settings service. Now, the "user" settings service has been + eliminated, so clients only have to track one D-Bus service to read and + update network configuration. The functionality of the old user settings + service has been replaced with a "permissions" key on each connection + object to preserve the ability to restrict which users can use the + connection, and with a "secret agent" D-Bus API for user-session-level + secure storage of network secrets and passwords. +

+

+ Elimination of the user settings service provides the following advantages + for clients of NetworkManager: +

+
    +
  • Simpler discovery of network configuration and change tracking
    • +
  • Simpler storage of user-level network secrets by control applets
    • +
  • Correct operation of fast-user switching and multi-seat configurations
    • +
  • More granular network connection permissions for system administrators
    • +
  • Connections are now system-wide by default (unless restricted by the user or system administrator)
    • +
  • Easier deployment of user-specific connections (ie, VPNs)
    • +
+

+

+

+ With this change, D-Bus methods that previously took a "service name" + argument (like + org.freedesktop.NetworkManager.ActivateConnection) and + objects with service name properties (like ActiveConnection objects) no + longer have those arguments or properties. +

+

+ Action: if you develop a network control + applet that talks to NetworkManager and used to provide a user settings + service, you can eliminate that code and rely on NetworkManager for all + storage of network configuration. Your applet should now implement the + Secret Agent D-Bus API (see below) to store user-specific secrets, and + add legacy user-specific configuration to NetworkManager when run. More + information about both these changes follows. +

+
+
+

+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 + system-wide storage (and thus available to all users). To allow this + functionality the concept of agents has been introduced. Using the new + + org.freedesktop.NetworkManager.AgentManager + D-Bus interface provided by NetworkManager, user applications can register + themselves as "secret agents", ie programs capable of saving and providing + secrets to NetworkManager. The agent should export the + + org.freedesktop.NetworkManager.SecretAgent + D-Bus interface, but should NOT claim a bus name on the system or session + bus. Instead, NetworkManager talks to the agent directly over the D-Bus + connection which the agent used to register itself. +

+

+ Each agent must send a unique identifier to NetworkManager when it + registers. This identifier must follow certain rules (see the NM D-Bus + API documentation for more details) but looks essentially the same as + a D-Bus service name. Only one agent using a given identifier may be + registered at the same time. The agent is automatically unregistered + if it disconnects from D-Bus or exits. +

+

+ When NetworkManager requires secrets during the attempt to connect to a + network, and no secrets are available from the internal settings service, + NetworkManager queries each registered agent for secrets. Agents that + are in "active" user sessions (as determined by ConsoleKit) are preferred + over inactive ones. Only agents belonging to users who have permission + to view and modify the connection are queried. For more information on + connection permissions, see below. +

+ When secrets are requested, the agent is also sent a set of flags that + modify the behavior of the request. By default, the agent should never + attempt to query the user for secrets, but should simply return any + available saved secrets. Other flags allow the agent to explicitly + request new secrets from the user. +

+ Action: the parts of a previous user + settings service that handled secrets may be easily repurposed as the bulk + of the implementation of a secret agent. The agent is sent all available + connection settings, and from those should be able to retrieve or save + any saved user secrets, or to request new secrets from the user. +

+
+
+

+Settings Service Interface Changes

+

+ With the elimination of the user settings service, the old + org.freedesktop.NetworkManagerUserSettings and + org.freedesktop.NetworkManagerSystemSettings D-Bus + service names are no longer used. Instead NetworkManager provides the + settings service using its own D-Bus service name, + org.freedesktop.NetworkManager. The object path of + the settings service remains unchanged. +

+

+ Additionally, the D-Bus interface of the settings service has changed + to + org.freedesktop.NetworkManager.Settings from + the old interface name of + org.freedesktop.NetworkManagerSettings, and the old + org.freedesktop.NetworkManagerSettings.System + interface has been merged into the new + + org.freedesktop.NetworkManager.Settings interface + as the split no longer made sense. This includes the + SaveHostname method and the Hostname + and CanModify properties. +

+

+ Action: change the service name that + your application uses to request system network settings to + org.freedesktop.NetworkManager, and update the D-Bus + interface that codes uses to talk to the settings service to + + org.freedesktop.NetworkManager.Settings. + Listen for hostname changes using the new interface name as well. +

+
+
+

+Connection Object Interface Changes

+

+ Consistent with the interface changes to the Settings object, the + Connection object's D-Bus interface has changed to + + org.freedesktop.NetworkManager.Settings.Connection + from the previous + org.freedesktop.NetworkManagerSettings.Connection. +

+

+ Additionally, the + org.freedesktop.NetworkManager.Settings.Connection.Updated + signal of the Connection object no longer includes the updated settings + data argument, as that might allow users who are not authorized to + view the connection details to do so. Instead, when a client receives the + Updated signal, it should requery the Connection's settings with the + org.freedesktop.NetworkManager.Settings.Connection.GetSettings + method. If the client receives an error as a result of this method call, + it should assume the connection has been deleted. +

+

+ Action: where code manipulates + Connection objects, update the D-Bus interface that code uses to be + org.freedesktop.NetworkManager.Settings.Connection. + Additionally, code that listens for the + org.freedesktop.NetworkManager.Settings.Connection.Updated + signal should no longer expect the new settings data as an argument, but + instead should request the new settings data using the + org.freedesktop.NetworkManager.Settings.Connection.GetSettings + method. +

+
+
+

+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 + callers that they should recheck permissions. Those two calls were: +

+
    +
  • +org.freedesktop.NetworkManagerSettings.System.GetPermissions + which returned a bitfield of operations the caller was allowed to + perform related to modify system network settings and the machine + hostname +
    • +
  • +org.freedesktop.NetworkManager.GetPermissions which + returned a dictionary mapping permission names to result strings like + "yes", "auth", or "no", relating to network control permissions like + the ability to enable or disable WiFi. +
    • +
+

+ These two calls have been consolidated into an enhanced + org.freedesktop.NetworkManager.GetPermissions call that + uses the same arguments, but includes all permissions, including those which + the settings service used to handle. +

+

+ With this change, the bitfield items from + org.freedesktop.NetworkManagerSettings.System.GetPermissions + are now string-based permissions. The mapping is as follows: +

+
+

Table 17. 

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
Old bitfield valueNew permission name
0x1 (connection-modify)
 + org.freedesktop.NetworkManager.settings.modify.system + or org.freedesktop.NetworkManager.settings.modify.system + depending on the permissions of the connection. + 
0x2 (wifi-share-protected)
 + org.freedesktop.NetworkManager.wifi.share.protected + 
0x4 (wifi-share-open)
 + org.freedesktop.NetworkManager.wifi.share.open + 
0x8 (hostname-modify)
 + org.freedesktop.NetworkManager.settings.modify.hostname +
+
+


+

+

+ Action: modify handling of existing + code that checks permissions to recognize the new permissions names for + old system settings permissions, and remove code that used to call + org.freedesktop.NetworkManagerSettings.System.GetPermissions. +

+
+
+

+AddConnection Returns Object Path of New Connection

+

+ The + org.freedesktop.NetworkManager.Settings.AddConnection + method call now returns the object path of the newly added + connection. Previously, if code wanted to manipulate a connection + post-addition, it had to wait for the new connection to be announced via + the NewConnection signal by matching connection UUIDs. Now the object + path is returned and this workaround is no longer required. +

+

+ Action: update code that adds new + connections to handle the object path returned from AddConnection, and + remove workarounds for finding the new connection via signals. +

+
+
+

+Support for WiMAX Devices

+

+ NetworkManager now supports Intel WiMAX mobile broadband devices. A + corresponding device type (NM_DEVICE_TYPE_WIMAX) and + a new + org.freedesktop.NetworkManager.Device.WiMax + D-Bus interface have been added. Furthermore, to support connection to + different WiMAX Network Service Providers (NSPs) the + + org.freedesktop.NetworkManager.Device.WiMax.Nsp + interface has been added to access information about each available + WiMAX network. +

+

+ Action: update code that handles + devices and/or displays status to users to recognize the new device type, + and to display available WiMAX NSPs similar to how WiFi Access Points + are displayed. Also update code that creates new connections to allow + creation of new WiMAX connections. +

+
+
+

+New Device States

+

+ A few new device states + have been added, and all device states have been renumbered for flexibility. + The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING. +

+

+ Action: where code checks device state + or shows UI indication of the device's state, make sure the new device + states are processed correctly, and that code in switch()-type statements + is updated to handle the new states. +

+
+
+

+New Active Connection State

+

+ Along with the new device states, an + additional + ActiveConnection state has been added: DEACTIVATING. This state + is entered when the connection is being torn down and deactivated. +

+

+ Action: where code checks active + connection states or shows UI indication of active connection states, make + sure the DEACTIVATING state is processed correctly, and that code in + switch()-type statements is updated to handle it. +

+
+
+

+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 + or UMTS/LTE modems like the Pantech UML290. The previous hard split + between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to + deal with these new multi-mode devices. Thus the previously separate + CDMA and GSM device classes have been combined into a single Modem + device class, which exposes both hardware "ModemCapabilities" and + runtime "CurrentCapabilities" which represent generic access technology + families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports. + ModemCapabilities indicate all the access technology families which the + modem is capable of supporting, while CurrentCapabilities indicate the + immediate access technology families the device supports without reloading + the firmware and thus restarting the device. +

+

+ Along with this change, the + org.freedesktop.NetworkManager.Device.Serial + interface has been removed as it's functionality will be incorporated + into the + + org.freedesktop.NetworkManager.Device.Modem + interface in the future. +

+

+ Action: combine code that checks for + the old CDMA and GSM device types, and instead handle the new Modem device + type. Where behavior must change based on the capabilities of the device, + check the CurrentCapabilities device property to determine whether to + treat the device as CDMA, GSM, or LTE for purposes of configuration and + status. +

+
+
+

+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 + an associated "flags" property that changes how NetworkManager treats the + secret. The "flags" property is a bitfield of one or more of the + following values: +

+
+

Table 18. 

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
Flag ValueMeaning
0x00 (none)
 + NetworkManager is responsible for providing and storing this + secret (default) + 
0x01 (agent-owned)
 + A user secret agent is responsible for providing and storing + this secret; when it is required agents will be asked to + retrieve it + 
0x02 (not saved)
 + The secret is not saved, and should be requested each time it + is required. Used for OTP/token configurations where the + secret changes periodically, or if the user simply wants to + manually enter the secret each time. + 
0x04 (not required)
 + In situations where it cannot be automatically determined that + the secret is required (some VPNs and PPP providers dont require + all possible secrets) this flag indicates that the specific + secret is not required. +
+
+


+

+

+ Action: user interface code which + handles entry of connection secrets should be updated to read and set + secret flags. For example, code that creates new VPN connections may want + to set the "agent-owned" flag to ensure that the user's VPN password is + not available to all users. EAP-TLS and VPN interface code might add a + checkbox that toggles the "not saved" bit to indicate that the + password/PIN code should be requested from a hardware token each time it + is required. +

+
+
+

+Deprecated Methods Removed

+

+ A few methods and signals of the org.freedesktop.NetworkManager + interface deprecated in version 0.7 have been removed. All the + replacement methods and signals have existed since version 0.7 and so are + not new to this version of NetworkManager, but some older programs may + be using removed items. The following table lists the removed items and + their replacements: +

+
+

Table 19. 

+
++++ + + + + + + + + + + + + + + +
Removed ItemReplacement
StateChange signal
 + Use the StateChanged signal, which has the + same arguments. + 
sleep() and wake() methods
 + Use the Sleep() method instead, which takes + a boolean argument indicating whether NetworkManager should + go to sleep or wake up. +
+
+


+

+

+ Action: update code to use these + replacement methods and properties where it used old deprecated ones +

+
+
+
+
+
+ Generated by GTK-Doc V1.17
+ + \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html new file mode 100644 index 00000000..7924bbce --- /dev/null +++ b/docs/api/html/ref-settings.html @@ -0,0 +1,1337 @@ + + + + +Network Configuration Setting Specification + + + + + + + + + + + + + + + + +
+

+Network Configuration Setting Specification

+
+
Configuration Settings
+
Secret flag types
+
+

+ This part documents the properties and value types of each "Setting" + object that composes the basic unit of NetworkManager configuration, + the "Connection". Each Connection object is simply a dictionary mapping + setting names (like "wimax" or "bluetooth") to a dictionary of + key/value pairs that represents each itself. +

+
+

+Configuration Settings

+

+

+
+

Table 1. 802-1x setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
name
string
802-1x
The setting's name; these names are defined by the specification and cannot be changed after the object has been created. Each setting class has a name, and all objects of that class share the same name.
eap
array of string
[]
The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
identity
string
Identity string for EAP authentication methods.  Often the user's user or login name.
anonymous-identity
string
Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
ca-cert
byte array
[]
Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
ca-path
string
UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.
client-cert
byte array
[]
Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
phase1-peapver
string
Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.
phase1-peaplabel
string
Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
phase1-fast-provisioning
string
Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
phase2-auth
string
Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
phase2-autheap
string
Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
phase2-ca-cert
byte array
[]
Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
phase2-ca-path
string
UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.
phase2-client-cert
byte array
[]
Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
password
string
Password used for EAP authentication methods.
password-flags
uint32
0
Flags indicating how to handle the 802.1x password. (see the section called “Secret flag types” for flag values)
private-key
byte array
[]
Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
private-key-password
string
The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
private-key-password-flags
uint32
0
Flags indicating how to handle the 802.1x private key password. (see the section called “Secret flag types” for flag values)
phase2-private-key
byte array
[]
Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
phase2-private-key-password
string
The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.
phase2-private-key-password-flags
uint32
0
Flags indicating how to handle the 802.1x phase2 private key password. (see the section called “Secret flag types” for flag values)
system-ca-certs
boolean
FALSE
When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.

+

+


+

+

+
Table 2. bluetooth setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
bluetooth
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
bdaddr
byte array
[]
The Bluetooth address of the device
type
string
Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.

+

+


+

+

+
Table 3. cdma setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
cdma
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
number
string
Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.
username
string
Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
password
string
Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
password-flags
uint32
0
Flags indicating how to handle the CDMA password. (see the section called “Secret flag types” for flag values)

+

+


+

+

+
Table 4. connection setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
connection
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
id
string
User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.
uuid
string
Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.
type
string
Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).
permissions
array of string
[]
An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the 'user' [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ':' character.  Any [reserved] information (if present) must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
autoconnect
boolean
TRUE
If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.
timestamp
uint64
0
Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.
read-only
boolean
FALSE
If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.

+

+


+

+

+
Table 5. gsm setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
gsm
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
number
string
Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.
username
string
Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
password
string
Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
password-flags
uint32
0
Flags indicating how to handle the GSM password. (see the section called “Secret flag types” for flag values)
apn
string
The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
network-id
string
The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
network-type
int32
-1
Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.
pin
string
If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
pin-flags
uint32
0
Flags indicating how to handle the GSM SIM PIN. (see the section called “Secret flag types” for flag values)
allowed-bands
uint32
1
Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.
home-only
boolean
FALSE
When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.

+

+


+

+

+
Table 6. ipv4 setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
ipv4
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
method
string
IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.
dns
array of uint32
[]
List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
dns-search
array of string
[]
List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
addresses
array of array of uint32
[]
Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.
routes
array of array of uint32
[]
Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.
ignore-auto-routes
boolean
FALSE
When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
ignore-auto-dns
boolean
FALSE
When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
dhcp-client-id
string
A string sent to the DHCP server to identify the local machine which the DHCP server may use to cusomize the DHCP lease and options.
dhcp-send-hostname
boolean
TRUE
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.
dhcp-hostname
string
If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.
never-default
boolean
FALSE
If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.
may-fail
boolean
FALSE
If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.

+

+


+

+

+
Table 7. ipv6 setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
ipv6
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
method
string
IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
dns
array of byte array
[]
Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
dns-search
array of string
[]
List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
addresses
array of (byte array, uint32, byte array)
[]
Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.
routes
array of (byte array, uint32, byte array, uint32)
[]
Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.
ignore-auto-routes
boolean
FALSE
When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
ignore-auto-dns
boolean
FALSE
When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
never-default
boolean
FALSE
If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.
may-fail
boolean
FALSE
If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.

+

+


+

+

+
Table 8. 802-11-olpc-mesh setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
802-11-olpc-mesh
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
ssid
byte array
[]
SSID of the mesh network to join.
channel
uint32
0
Channel on which the mesh network to join is located.
dhcp-anycast-address
byte array
[]
Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.

+

+


+

+

+
Table 9. ppp setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
ppp
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
noauth
boolean
TRUE
If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
refuse-eap
boolean
FALSE
If TRUE, the EAP authentication method will not be used.
refuse-pap
boolean
FALSE
If TRUE, the PAP authentication method will not be used.
refuse-chap
boolean
FALSE
If TRUE, the CHAP authentication method will not be used.
refuse-mschap
boolean
FALSE
If TRUE, the MSCHAP authentication method will not be used.
refuse-mschapv2
boolean
FALSE
If TRUE, the MSCHAPv2 authentication method will not be used.
nobsdcomp
boolean
FALSE
If TRUE, BSD compression will not be requested.
nodeflate
boolean
FALSE
If TRUE, 'deflate' compression will not be requested.
no-vj-comp
boolean
FALSE
If TRUE, Van Jacobsen TCP header compression will not be requested.
require-mppe
boolean
FALSE
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
require-mppe-128
boolean
FALSE
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
mppe-stateful
boolean
FALSE
If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
crtscts
boolean
FALSE
If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
baud
uint32
0
If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
mru
uint32
0
If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
mtu
uint32
0
If non-zero, instruct pppd to send packets no larger than the specified size.
lcp-echo-failure
uint32
0
If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.
lcp-echo-interval
uint32
0
If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.

+

+


+

+

+
Table 10. pppoe setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
pppoe
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
service
string
If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
username
string
Username used to authenticate with the PPPoE service.
password
string
Password used to authenticate with the PPPoE service.
password-flags
uint32
0
Flags indicating how to handle the PPPoE password. (see the section called “Secret flag types” for flag values)

+

+


+

+

+
Table 11. serial setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
serial
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
baud
uint32
57600
Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
bits
uint32
8
Byte-width of the serial communication.  The 8 in '8n1' for example.
parity
gchar
110
Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.
stopbits
uint32
1
Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.
send-delay
uint64
0
Time to delay between each byte sent to the modem, in microseconds.

+

+


+

+

+
Table 12. vpn setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
vpn
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
service-type
string
D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
user-name
string
User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.
data
dict of (string::string)
[ ]
Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
secrets
dict of (string::string)
[ ]
Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.

+

+


+

+

+
Table 13. wimax setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
wimax
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
network-name
string
Network Service Provider (NSP) name of the WiMAX network this connection should use.
mac-address
byte array
[]
If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).

+

+


+

+

+
Table 14. 802-3-ethernet setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
802-3-ethernet
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
port
string
Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.
speed
uint32
0
If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.
duplex
string
If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.
auto-negotiate
boolean
TRUE
If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.
mac-address
byte array
[]
If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
cloned-mac-address
byte array
[]
If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
mtu
uint32
0
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
s390-subchannels
GPtrArray_gchararray_
[]
Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
s390-nettype
string
s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.
s390-options
dict of (string::string)
[ ]
Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.

+

+


+

+

+
Table 15. 802-11-wireless setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
802-11-wireless
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
ssid
byte array
[]
SSID of the WiFi network.  Must be specified.
mode
string
WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.
band
string
802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
channel
uint32
0
Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.
bssid
byte array
[]
If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
rate
uint32
0
If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
tx-power
uint32
0
If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
mac-address
byte array
[]
If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
cloned-mac-address
byte array
[]
If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
mtu
uint32
0
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
seen-bssids
array of string
[]
A list of BSSIDs (each BSSID formatted as a MAC address like '00:11:22:33:44:55') that have been detected as part of the WiFI network.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.
security
string
If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.

+

+


+

+

+
Table 16. 802-11-wireless-security setting

+

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






Key NameValue TypeDefault ValueValue Description
name
string
802-11-wireless-security
The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
key-mgmt
string
Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.
wep-tx-keyidx
uint32
0
When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
auth-alg
string
When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.
proto
array of string
[]
List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
pairwise
array of string
[]
If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
group
array of string
[]
If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
leap-username
string
The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
wep-key0
string
Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key1
string
Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key2
string
Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key3
string
Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key-flags
uint32
0
Flags indicating how to handle the WEP keys. (see the section called “Secret flag types” for flag values)
wep-key-type
uint32
0
Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.
psk
string
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.
psk-flags
uint32
0
Flags indicating how to handle the WPA PSK key. (see the section called “Secret flag types” for flag values)
leap-password
string
The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
leap-password-flags
uint32
0
Flags indicating how to handle the LEAP password. (see the section called “Secret flag types” for flag values)

+

+


+  

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/api/html/right.png b/docs/api/html/right.png
new file mode 100644
index 00000000..92832e3a
Binary files /dev/null and b/docs/api/html/right.png differ
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
new file mode 100644
index 00000000..ee0a78fe
--- /dev/null
+++ b/docs/api/html/secrets-flags.html
@@ -0,0 +1,64 @@
+
+
+
+
+Secret flag types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Secret flag types

+

+        Each secret property in a setting has an associated "flags" property
+        that describes how to handle that secret.  The "flags" property is a
+        bitfield that contains zero or more of the following values logically
+        OR-ed together.
+      

+

+        

+
    
+
  • 
+0x0 (none) - the system is responsible for providing
+            and storing this secret.
+          
    • 
+
  • 
+0x1 (agent-owned) - a user-session secret agent
+            is responsible for providing and storing this secret; when it is
+            required, agents will be asked to provide it.
+          
    • 
+
  • 
+0x2 (not-saved) - this secret should not be saved
+            but should be requested from the user each time it is required. This
+            flag should be used for One-Time-Pad secrets, PIN codes from
+            hardware tokens, or if the user simply does not want to save the
+            secret.
+          
    • 
+
  • 
+0x4 (not-required) - in some situations it cannot
+            be automatically determined that a secret is required or not.  This
+            flag hints that the secret is not required and should not be
+            requested from the user.
+          
    • 
+

+

+      

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
new file mode 100644
index 00000000..5bb127d4
--- /dev/null
+++ b/docs/api/html/spec.html
@@ -0,0 +1,1390 @@
+
+NetworkManager D-Bus Interface Specification version 0.9
NetworkManager D-Bus Interface Specification
Version 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.

+
Interfaces

+  
org.freedesktop.NetworkManager
Methods:
GetDevices (
+        
+        ) →
+        ao

+        Get the list of network devices.
+      
Returns
devices -
+      ao

+          List of object paths of network devices known to the system.
+        
GetDeviceByIpIface (
+        s: iface
+        ) →
+        o

+        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.
+      
Parameters
iface -
+      s

+          Interface name of the device to find.
+        
Returns
device -
+      o

+          Object path of the network device.
+        
ActivateConnection (
+        o: connection, o: device, o: specific_object
+        ) →
+        o

+        Activate a connection using the supplied device.
+      
Parameters
connection -
+      o

+          The connection to activate the devices with.
+        
device -
+      o

+          The object path of device to be activated for physical connections.  This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+        
specific_object -
+      o

+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, or "/" to pick and AP automatically.  For VPN connections, pass
+          the object path of an ActiveConnection object that should serve as the
+          "base" connection (to which the VPN connections lifetime will be tied),
+          or pass "/" and NM will automatically use the current default device.
+        
Returns
active_connection -
+      o

+          The path of the active connection object representing this active connection.
+        
Possible errors
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    (generic description)
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    (generic description)
org.freedesktop.NetworkManager.Error.ConnectionActivating
Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?
org.freedesktop.NetworkManager.Error.ConnectionInvalid
The connection is invalid for this device.
AddAndActivateConnection (
+        a{sa{sv}}: connection, o: device, o: specific_object
+        ) →
+        o, o

+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      
Parameters
connection -
+      a{sa{sv}}

+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        
device -
+      o

+          The object path of device to be activated using the given connection.
+        
specific_object -
+      o

+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        
Returns
path -
+      o

+          Object path of the new connection that was just added.
+        
active_connection -
+      o

+          The path of the active connection object representing this active connection.
+        
Possible errors
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    (generic description)
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    (generic description)
org.freedesktop.NetworkManager.Error.ConnectionInvalid
The connection is invalid for this device.
DeactivateConnection (
+        o: active_connection
+        ) →
+        nothing

+        Deactivate an active connection.
+      
Parameters
active_connection -
+      o

+          The currently active connection to deactivate.
+        
Sleep (
+        b: sleep
+        ) →
+        nothing

+        Control the NetworkManager daemon's sleep state.  When asleep, all
+        interfaces that it manages are deactivated.  When awake, devices are
+        available to be activated.  This command should not be called directly
+        by users or clients; it is intended for system suspend/resume tracking.
+      
Parameters
sleep -
+      b

+          Indicates whether the NetworkManager daemon should sleep or wake.
+        
Enable (
+        b: enable
+        ) →
+        nothing

+        Control whether overall networking is enabled or disabled.  When
+        disabled, all interfaces that NM manages are deactivated.  When enabled,
+        all managed interfaces are re-enabled and available to be activated.
+        This command should be used by clients that provide to users the ability
+        to enable/disable all networking.
+      
Parameters
enable -
+      b

+          If FALSE, indicates that all networking should be disabled.  If TRUE,
+          indicates that NetworkManager should begin managing network devices.
+        
GetPermissions (
+        
+        ) →
+        a{ss}

+        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        WiFi, WWAN, and WiMAX state, etc.
+      
Returns
permissions -
+      a{ss}

+          Dictionary of available permissions and results.  Each permission
+          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
+          and each result is one of the following values: "yes" (the permission
+          is available), "auth" (the permission is available after a successful
+          authentication), or "no" (the permission is denied).  Clients may use
+          these values in the UI to indicate the ability to perform certain
+          operations.
+        
SetLogging (
+        s: level, s: domains
+        ) →
+        nothing

+        Set logging verbosity and which operations are logged.
+      
Parameters
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          A combination of logging domains separated by commas (','), or "NONE"
+          to disable logging.  Each domain enables logging for operations
+          related to that domain.  Available domains are: [NONE, HW, RFKILL,
+          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
+          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
+          DEVICE, OLPC]
+        
state (
+        
+        ) →
+        u

+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+      
Returns
state -
+      u
+      (NM_STATE)
+    
Signals:
CheckPermissions (
+        
+        )

+        Emitted when system authorization details change, indicating that
+        clients may wish to recheck permissions with GetPermissions.
+      
StateChanged (
+        u: state
+        )

+        NetworkManager's state changed.
+      
Parameters
state -
+      u
+      (NM_STATE)
+    

+          The new state of NetworkManager.
+        
PropertiesChanged (
+        a{sv}: properties
+        )

+        NetworkManager's properties changed.
+      
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+          The changed properties.
+        
DeviceAdded (
+        o: device_path
+        )

+        A device was added to the system
+      
Parameters
device_path -
+      o

+          The object path of the newly added device.
+        
DeviceRemoved (
+        o: device_path
+        )

+        A device was removed from the system, and is no longer available.
+      
Parameters
device_path -
+      o

+          The object path of the device that was just removed.
+        
Properties:
NetworkingEnabled -
+      b -
+      (read)

+        Indicates if overall networking is currently enabled or not.  See the
+        Enable() method.
+      
WirelessEnabled -
+      b -
+      (readwrite)

+        Indicates if wireless is currently enabled or not.
+      
WirelessHardwareEnabled -
+      b -
+      (read)

+        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
+      
WwanEnabled -
+      b -
+      (readwrite)

+        Indicates if mobile broadband devices are currently enabled or not.
+      
WwanHardwareEnabled -
+      b -
+      (read)

+        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+      
WimaxEnabled -
+      b -
+      (readwrite)

+        Indicates if WiMAX devices are currently enabled or not.
+      
WimaxHardwareEnabled -
+      b -
+      (read)

+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      
ActiveConnections -
+      ao -
+      (read)

+        List of active connection object paths.
+      
Version -
+      s -
+      (read)

+        NetworkManager version.
+      
State -
+      u -
+      (read)
+      (NM_STATE)
+    

+        The overall state of the NetworkManager daemon.
+      
Enumerated types:
NM_STATE

+        Describes the overall state of the daemon.
+      
NM_STATE_UNKNOWN = 0

+          Networking state is unknown.
+        
NM_STATE_ASLEEP = 10

+          Networking is inactive and all devices are disabled.
+        
NM_STATE_DISCONNECTED = 20

+          There is no active network connection.
+        
NM_STATE_DISCONNECTING = 30

+          Network connections are being cleaned up.
+        
NM_STATE_CONNECTING = 40

+          A network device is connecting to a network and there is no other
+          available network connection.
+        
NM_STATE_CONNECTED_LOCAL = 50

+          A network device is connected, but there is only link-local connectivity.
+        
NM_STATE_CONNECTED_SITE = 60

+          A network device is connected, but there is only site-local connectivity.
+        
NM_STATE_CONNECTED_GLOBAL = 70

+          A network device is connected, with global network connectivity.
+        

+
+  
org.freedesktop.NetworkManager.AccessPoint
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Flags -
+      u -
+      (read)
+      (NM_802_11_AP_FLAGS)
+    
Flags describing the capabilities of the access point.
WpaFlags -
+      u -
+      (read)
+      (NM_802_11_AP_SEC)
+    
Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
RsnFlags -
+      u -
+      (read)
+      (NM_802_11_AP_SEC)
+    
Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
Ssid -
+      ay -
+      (read)
The Service Set Identifier identifying the access point.
Frequency -
+      u -
+      (read)
The radio channel frequency in use by the access point, in MHz.
HwAddress -
+      s -
+      (read)
The hardware address (BSSID) of the access point.
Mode -
+      u -
+      (read)
+      (NM_802_11_MODE)
+    
Describes the operating mode of the access point.
MaxBitrate -
+      u -
+      (read)
The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
Strength -
+      y -
+      (read)
The current signal quality of the access point, in percent.
Sets of flags:
NM_802_11_AP_FLAGS

+        Flags describing the general capabilities of the access point.
+      
NM_802_11_AP_FLAGS_NONE = 0x0
Null capability - says nothing about the access point.
NM_802_11_AP_FLAGS_PRIVACY = 0x1
Access point supports privacy measures.
NM_802_11_AP_SEC

+        Flags describing the security capabilities of the access point.
+      
NM_802_11_AP_SEC_NONE = 0x0
Null flag.
NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
Access point supports pairwise 40-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
Access point supports pairwise 104-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_TKIP = 0x4
Access point supports pairwise TKIP encryption.
NM_802_11_AP_SEC_PAIR_CCMP = 0x8
Access point supports pairwise CCMP encryption.
NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
Access point supports a group 40-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
Access point supports a group 104-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_TKIP = 0x40
Access point supports a group TKIP cipher.
NM_802_11_AP_SEC_GROUP_CCMP = 0x80
Access point supports a group CCMP cipher.
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
Access point supports PSK key management.
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
Access point supports 802.1x key management.

+
+  
org.freedesktop.NetworkManager.Device
Methods:
Disconnect (
+        
+        ) →
+        nothing

+        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
+      
Signals:
StateChanged (
+        u: new_state, u: old_state, u: reason
+        )
Parameters
new_state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The new state of the device.
+        
old_state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The previous state of the device.
+        
reason -
+      u
+      (NM_DEVICE_STATE_REASON)
+    

+          A reason for the state transition.
+        
Properties:
Udi -
+      s -
+      (read)

+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
+      
Interface -
+      s -
+      (read)

+        The name of the device's control (and often data) interface.
+      
IpInterface -
+      s -
+      (read)

+        The name of the device's data interface when available.  This property
+        may not refer to the actual data interface until the device has
+        successfully established a data connection, indicated by the device's
+        State becoming ACTIVATED.
+      
Driver -
+      s -
+      (read)

+        The driver handling the device.
+      
Capabilities -
+      u -
+      (read)
+      (NM_DEVICE_CAP)
+    

+        Flags describing the capabilities of the device.
+      
Ip4Address -
+      i -
+      (read)

+        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
+      
State -
+      u -
+      (read)
+      (NM_DEVICE_STATE)
+    

+        The current state of the device.
+      
Ip4Config -
+      o -
+      (read)

+        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Dhcp4Config -
+      o -
+      (read)

+        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Ip6Config -
+      o -
+      (read)

+        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Dhcp6Config -
+      o -
+      (read)

+        Object path of the Dhcp6Config object describing the DHCP options
+        returned by the DHCP server.  Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+      
Managed -
+      b -
+      (read)

+        Whether or not this device is managed by NetworkManager.
+      
FirmwareMissing -
+      b -
+      (read)

+        If TRUE, indicates the device is likely missing firmware necessary for
+        its operation.
+      
DeviceType -
+      u -
+      (read)
+      (NM_DEVICE_TYPE)
+    

+        The general type of the network device; ie Ethernet, WiFi, etc.
+      
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

+          The device is in an unknown state.
+        
NM_DEVICE_STATE_UNMANAGED = 10

+          The device is recognized but not managed by NetworkManager.
+        
NM_DEVICE_STATE_UNAVAILABLE = 20

+          The device cannot be used (carrier off, rfkill, etc).
+        
NM_DEVICE_STATE_DISCONNECTED = 30

+          The device is not connected.
+        
NM_DEVICE_STATE_PREPARE = 40

+          The device is preparing to connect.
+        
NM_DEVICE_STATE_CONFIG = 50

+          The device is being configured.
+        
NM_DEVICE_STATE_NEED_AUTH = 60

+          The device is awaiting secrets necessary to continue connection.
+        
NM_DEVICE_STATE_IP_CONFIG = 70

+          The IP settings of the device are being requested and configured.
+        
NM_DEVICE_STATE_IP_CHECK = 80

+          The device's IP connectivity ability is being determined.
+        
NM_DEVICE_STATE_SECONDARIES = 90

+          The device is waiting for secondary connections to be activated.
+        
NM_DEVICE_STATE_ACTIVATED = 100

+          The device is active.
+        
NM_DEVICE_STATE_DEACTIVATING = 110

+          The device's network connection is being torn down.
+        
NM_DEVICE_STATE_FAILED = 120

+          The device is in a failure state following an attempt to activate it.
+        
NM_DEVICE_TYPE
NM_DEVICE_TYPE_UNKNOWN = 0

+          The device type is unknown.
+        
NM_DEVICE_TYPE_ETHERNET = 1

+          The device is wired Ethernet device.
+        
NM_DEVICE_TYPE_WIFI = 2

+          The device is an 802.11 WiFi device.
+        
NM_DEVICE_TYPE_UNUSED1 = 3
Unused
NM_DEVICE_TYPE_UNUSED2 = 4
Unused
NM_DEVICE_TYPE_BT = 5

+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        
NM_DEVICE_TYPE_OLPC_MESH = 6

+          The device is an OLPC mesh networking device.
+        
NM_DEVICE_TYPE_WIMAX = 7

+          The device is an 802.16e Mobile WiMAX device.
+        
NM_DEVICE_TYPE_MODEM = 8

+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
+        
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

+          The state change is normal.
+        
NM_DEVICE_STATE_REASON_NOW_MANAGED = 2

+          The device is now managed.
+        
NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3

+          The device is no longer managed.
+        
NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4

+          The device could not be readied for configuration.
+        
NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5

+          IP configuration could not be reserved (no available address, timeout, etc).
+        
NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6

+          The IP configuration is no longer valid.
+        
NM_DEVICE_STATE_REASON_NO_SECRETS = 7

+          Secrets were required, but not provided.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8

+          The 802.1X supplicant disconnected from the access point or authentication server.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9

+          Configuration of the 802.1X supplicant failed.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10

+          The 802.1X supplicant quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11

+          The 802.1X supplicant took too long to authenticate.
+        
NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12

+          The PPP service failed to start within the allowed time.
+        
NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13

+          The PPP service disconnected unexpectedly.
+        
NM_DEVICE_STATE_REASON_PPP_FAILED = 14

+          The PPP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15

+          The DHCP service failed to start within the allowed time.
+        
NM_DEVICE_STATE_REASON_DHCP_ERROR = 16

+          The DHCP service reported an unexpected error.
+        
NM_DEVICE_STATE_REASON_DHCP_FAILED = 17

+          The DHCP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18

+          The shared connection service failed to start.
+        
NM_DEVICE_STATE_REASON_SHARED_FAILED = 19

+          The shared connection service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20

+          The AutoIP service failed to start.
+        
NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21

+          The AutoIP service reported an unexpected error.
+        
NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22

+          The AutoIP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_MODEM_BUSY = 23

+          Dialing failed because the line was busy.
+        
NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24

+          Dialing failed because there was no dial tone.
+        
NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25

+          Dialing failed because there was carrier.
+        
NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26

+          Dialing timed out.
+        
NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27

+          Dialing failed.
+        
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28

+          Modem initialization failed.
+        
NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29

+          Failed to select the specified GSM APN.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30

+          Not searching for networks.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31

+          Network registration was denied.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32

+          Network registration timed out.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33

+          Failed to register with the requested GSM network.
+        
NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34

+          PIN check failed.
+        
NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35

+          Necessary firmware for the device may be missing.
+        
NM_DEVICE_STATE_REASON_REMOVED = 36

+          The device was removed.
+        
NM_DEVICE_STATE_REASON_SLEEPING = 37

+          NetworkManager went to sleep.
+        
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38

+          The device's active connection was removed or disappeared.
+        
NM_DEVICE_STATE_REASON_USER_REQUESTED = 39

+          A user or client requested the disconnection.
+        
NM_DEVICE_STATE_REASON_CARRIER = 40

+          The device's carrier/link changed.
+        
NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41

+          The device's existing connection was assumed.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42

+          The 802.1x supplicant is now available.
+        
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43

+          The modem could not be found.
+        
NM_DEVICE_STATE_REASON_BT_FAILED = 44

+          The Bluetooth connection timed out or failed.
+        
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.

+
+  
org.freedesktop.NetworkManager.Device.Wired
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Active hardware address of the device.
+      
PermHwAddress -
+      s -
+      (read)

+        Permanent hardware address of the device.
+      
Speed -
+      u -
+      (read)

+        Design speed of the device, in megabits/second (Mb/s).
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Wireless
Methods:
GetAccessPoints (
+        
+        ) →
+        ao

+        Get the list of access points visible to this device.
+      
Returns
access_points -
+      ao

+          List of access point object paths
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the wireless device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary containing the FIXME: check changed parameters.
+            
AccessPointAdded (
+        o: access_point
+        )

+            Emitted when a new access point is found by the device.
+        
Parameters
access_point -
+      o

+                The object path of the newly found access point.
+            
AccessPointRemoved (
+        o: access_point
+        )

+            Emitted when an access point disappears from view of the device.
+        
Parameters
access_point -
+      o

+                The object path of the access point that has disappeared.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        The active hardware address of the device.
+      
PermHwAddress -
+      s -
+      (read)

+        The permanent hardware address of the device.
+      
Mode -
+      u -
+      (read)
+      (NM_802_11_MODE)
+    

+        The operating mode of the wireless device.
+      
Bitrate -
+      u -
+      (read)

+        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
+      
ActiveAccessPoint -
+      o -
+      (read)

+        Object path of the access point currently used by the wireless device.
+      
WirelessCapabilities -
+      u -
+      (read)
+      (NM_802_11_DEVICE_CAP)
+    

+        The capabilities of the wireless device.
+      
Sets of flags:
NM_802_11_DEVICE_CAP

+        Flags describing the capabilities of a wireless device.
+      
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.

+
+  
org.freedesktop.NetworkManager.Device.Modem
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
ModemCapabilities -
+      u -
+      (read)
+      (NM_DEVICE_MODEM_CAPABILITIES)
+    

+        The generic family of access technologies the modem supports.  Not all
+        capabilities are available at the same time however; some modems require
+        a firmware reload or other reinitialization to switch between eg CDMA/EVDO
+        and GSM/UMTS.
+      
CurrentCapabilities -
+      u -
+      (read)
+      (NM_DEVICE_MODEM_CAPABILITIES)
+    

+        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+      
Sets of flags:
NM_DEVICE_MODEM_CAPABILITIES

+        Flags describing one or more of the general access technology families
+        that a modem device supports.
+      
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0
Modem has no capabilties.
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1

+          Modem supports the analog wired telephone network (ie 56k dialup) and
+          does not have wireless/cellular capabilities.
+        
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2

+          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
+          revision A, or EVDO revision B.
+        
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4

+          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
+          HSPA+ packet switched data capability.
+        
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8

+          Modem has at LTE data capability.
+        

+
+  
org.freedesktop.NetworkManager.Device.Bluetooth
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Bluetooth hardware address of the device.
+      
Name -
+      s -
+      (read)

+        Bluetooth name of the device.
+      
BtCapabilities -
+      u -
+      (read)
+      (NM_BT_CAPABILITIES)
+    

+        Bluetooth capabilities of the device (either DUN or NAP).
+      
Sets of flags:
NM_BT_CAPABILITIES

+        Flags describing the capabilities of a Bluetooth device.
+      
NM_BT_CAPABILITY_NONE = 0x0
The device has no recognized capabilities.
NM_BT_CAPABILITY_DUN = 0x1
The device supports Bluetooth Dial-Up Networking.
NM_BT_CAPABILITY_PAN = 0x2
The device supports Bluetooth Personal Area Networking.

+
+  
org.freedesktop.NetworkManager.Device.OlpcMesh
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the wireless device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary containing the FIXME: check changed parameters.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        The hardware address of the device.
+      
Companion -
+      o -
+      (read)

+        The object path of the companion device.
+      
ActiveChannel -
+      u -
+      (read)

+        The currently active channel.
+      

+
+  
org.freedesktop.NetworkManager.Device.WiMax
Methods:
GetNspList (
+        
+        ) →
+        ao

+        Get the list of NSPs visible to this device.
+      
Returns
nsps -
+      ao

+          List of NSP object paths
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the WiMax device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values.
+            
NspAdded (
+        o: nsp
+        )

+            Emitted when a new NSP is found by the device.
+        
Parameters
nsp -
+      o

+                The object path of the newly found NSP.
+            
NspRemoved (
+        o: nsp
+        )

+            Emitted when an NSP disappears from view of the device.
+        
Parameters
nsp -
+      o

+                The object path of the NSP that has disappeared.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
CenterFrequency -
+      u -
+      (read)

+        Center frequency (in KHz) of the radio channel the device is using to
+        communicate with the network when connected.  Has no meaning when the
+        device is not connected.
+      
Rssi -
+      i -
+      (read)

+        RSSI of the current radio link in dBm.  This value indicates how strong
+        the raw received RF signal from the base station is, but does not
+        indicate the overall quality of the radio link.  Has no meaning when the
+        device is not connected.
+      
Cinr -
+      i -
+      (read)

+        CINR (Carrier to Interference + Noise Ratio) of the current radio link
+        in dB.  CINR is a more accurate measure of radio link quality.  Has no
+        meaning when the device is not connected.
+      
TxPower -
+      i -
+      (read)

+        Average power of the last burst transmitted by the device, in units of
+        0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+        -5.5 dBm.  Has no meaning when the device is not connected.
+      
Bsid -
+      s -
+      (read)

+        The ID of the serving base station as received from the network.  Has
+        no meaning when the device is not connected.
+      
ActiveNsp -
+      o -
+      (read)

+        Object path of the NSP currently used by the WiMax device.
+      

+
+  
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values.
+            
Properties:
Name -
+      s -
+      (read)
The name of the NSP.
SignalQuality -
+      u -
+      (read)
The current signal quality of the NSP, in percent.
NetworkType -
+      u -
+      (read)
+      (NM_WIMAX_NSP_NETWORK_TYPE)
+    
The network type of the NSP.
Sets of flags:
NM_WIMAX_NSP_NETWORK_TYPE

+        Network type of the NSP.
+      
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0
Unknown network.
NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1
Home network.
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2
Partner network.
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3
Roaming partner network.

+
+  
org.freedesktop.NetworkManager.IP4Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
+      aau -
+      (read)
Array of tuples of IPv4 address/prefix/gateway.  All 3
+      elements of each tuple are in network byte order.  Essentially:
+      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+      
Nameservers -
+      au -
+      (read)
The nameservers in use.
WinsServers -
+      au -
+      (read)
The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.
Domains -
+      as -
+      (read)
A list of domains this address belongs to.
Routes -
+      aau -
+      (read)
Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
+      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
+      addresses, while prefix and metric are simple unsigned integers.  Essentially:
+      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
+      

+
+  
org.freedesktop.NetworkManager.IP6Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
+      a(ayuay) -
+      (read)
Tuples of IPv6 address/prefix/gateway.
Nameservers -
+      aay -
+      (read)
The nameservers in use.
Domains -
+      as -
+      (read)
A list of domains this address belongs to.
Routes -
+      a(ayuayu) -
+      (read)
Tuples of IPv6 route/prefix/next-hop/metric.

+
+    
org.freedesktop.NetworkManager.DHCP4Config

+            Options and configuration returned by the IPv4 DHCP server.
+        
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                    A dictionary mapping property names to variant boxed values
+                
Properties:
Options -
+      a{sv} -
+      (read)
Configuration options returned by a DHCP server, if any.

+
+    
org.freedesktop.NetworkManager.DHCP6Config

+            Options and configuration returned by the IPv6 DHCP server.
+        
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                    A dictionary mapping property names to variant boxed values
+                
Properties:
Options -
+      a{sv} -
+      (read)
Configuration options returned by a DHCP server, if any.

+
+  
org.freedesktop.NetworkManager.Settings

+      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
+    
Methods:
ListConnections (
+        
+        ) →
+        ao

+        List the connections stored by this Settings object.
+      
Returns
connections -
+      ao

+          List of connections.
+        
GetConnectionByUuid (
+        s: uuid
+        ) →
+        o

+        Retrieve the object path of a connection, given that connection's UUID.
+      
Parameters
uuid -
+      s

+          The UUID to find the connection object path for.
+        
Returns
connection -
+      o

+          The connection's object path.
+        
AddConnection (
+        a{sa{sv}}: connection
+        ) →
+        o

+        Add new connection.
+      
Parameters
connection -
+      a{sa{sv}}

+          Connection settings and properties.
+        
Returns
path -
+      o

+          Object path of the new connection that was just added.
+        
SaveHostname (
+        s: hostname
+        ) →
+        nothing

+        Save the hostname to persistent configuration.
+      
Parameters
hostname -
+      s

+          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
NewConnection (
+        o: connection
+        )

+        Emitted when a new connection has been added.
+      
Parameters
connection -
+      o

+          Object path of the new connection.
+        
Properties:
Hostname -
+      s -
+      (read)

+        The machine hostname stored in persistent configuration.
+      
CanModify -
+      b -
+      (read)

+        If true, adding and modifying connections is supported.
+      

+
+
+    
org.freedesktop.NetworkManager.Settings.Connection

+            Represents a single network connection configuration.
+        
Methods:
Update (
+        a{sa{sv}}: properties
+        ) →
+        nothing

+            Update the connection with new settings and properties, replacing
+            all previous settings and properties.  Secrets may be part of the
+            update request, and will be either stored in persistent storage or
+            given to a Secret Agent for storage, depending on the request.
+          
Parameters
properties -
+      a{sa{sv}}

+              New connection settings, properties, and (optionally) secrets.
+            
Delete (
+        
+        ) →
+        nothing

+            Delete the connection.
+          
GetSettings (
+        
+        ) →
+        a{sa{sv}}

+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                to the network, as those are often protected.  Secrets must
+                be requested separately using the GetSecrets() call.
+            
Returns
settings -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+                    The nested settings maps describing this object.
+                
GetSecrets (
+        s: setting_name
+        ) →
+        a{sa{sv}}

+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                the requestor's session will be returned.  The user will never
+                be prompted for secrets as a result of this request.
+            
Parameters
setting_name -
+      s

+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
+                
Returns
secrets -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+                    Nested settings maps containing secrets.
+                
Signals:
Updated (
+        
+        )

+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            
Removed (
+        
+        )

+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessable by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.
+            
Interface has no properties.

+
+
+  
org.freedesktop.NetworkManager.Connection.Active
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Connection -
+      o -
+      (read)
The path of the connection.
SpecificObject -
+      o -
+      (read)
A specific object associated with the active connection.
Uuid -
+      s -
+      (read)

+        The UUID of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      
Devices -
+      ao -
+      (read)
Array of object paths representing devices which are part of this active connection.
State -
+      u -
+      (read)
+      (NM_ACTIVE_CONNECTION_STATE)
+    
The state of this active connection.
Default -
+      b -
+      (read)
Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.
Default6 -
+      b -
+      (read)
Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.
Vpn -
+      b -
+      (read)
Whether this active connection is also a VPN connection.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

+          The active connection is in an unknown state.
+        
NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1

+          The connection is activating.
+        
NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2

+          The connection is activated.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

+          The connection is being torn down and cleaned up.
+        

+
+  
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
+        s: identifier
+        ) →
+        nothing

+        Called by secret Agents to register their ability to provide and save
+        network secrets.
+      
Parameters
identifier -
+      s

+          Identifies this agent; only one agent in each user session may use the
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        
Unregister (
+        
+        ) →
+        nothing

+        Called by secret Agents to notify NetworkManager that they will no
+        longer handle requests for network secrets.  Agents are automatically
+        unregistered when they disconnect from D-Bus.
+      
Interface has no signals.
Interface has no properties.

+
+  
org.freedesktop.NetworkManager.VPN.Connection

+      Represents an active connection to a Virtual Private Network.
+    
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
VpnStateChanged (
+        u: state, u: reason
+        )

+        Emitted when the state of the VPN connection has changed.
+      
Parameters
state -
+      u
+      (NM_VPN_CONNECTION_STATE)
+    

+          The new state of the VPN connection.
+        
reason -
+      u
+      (NM_VPN_CONNECTION_STATE_REASON)
+    

+          Reason code describing the change to the new state.
+        
Properties:
VpnState -
+      u -
+      (read)
+      (NM_VPN_CONNECTION_STATE)
+    
The VPN-specific state of the connection.
Banner -
+      s -
+      (read)
The banner string of the VPN connection.
Enumerated types:
NM_VPN_CONNECTION_STATE
NM_VPN_CONNECTION_STATE_UNKNOWN = 0

+          The state of the VPN connection is unknown.
+        
NM_VPN_CONNECTION_STATE_PREPARE = 1

+          The VPN connection is preparing to connect.
+        
NM_VPN_CONNECTION_STATE_NEED_AUTH = 2

+          The VPN connection needs authorization credentials.
+        
NM_VPN_CONNECTION_STATE_CONNECT = 3

+          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
+        
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4

+          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
+        
NM_VPN_CONNECTION_STATE_ACTIVATED = 5

+          The VPN connection is active.
+        
NM_VPN_CONNECTION_STATE_FAILED = 6

+          The VPN connection failed.
+        
NM_VPN_CONNECTION_STATE_DISCONNECTED = 7

+          The VPN connection is disconnected.
+        
NM_VPN_CONNECTION_STATE_REASON
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0

+          The reason for the VPN connection state change is unknown.
+        
NM_VPN_CONNECTION_STATE_REASON_NONE = 1

+          No reason was given for the VPN connection state change.
+        
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2

+          The VPN connection changed state because the user disconnected it.
+        
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3

+          The VPN connection changed state because the device it was using was disconnected.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4

+          The service providing the VPN connection was stopped.
+        
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5

+          The IP config of the VPN connection was invalid.
+        
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6

+          The connection attempt to the VPN service timed out.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7

+          A timeout occurred while starting the service providing the VPN connection.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8

+          Starting the service starting the service providing the VPN connection failed.
+        
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9

+          Necessary secrets for the VPN connection were not provided.
+        
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10

+          Authentication to the VPN server failed.
+        
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11

+          The connection was deleted from settings.
+        

+
+  
org.freedesktop.NetworkManager.VPN.Plugin

+      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
+    
Methods:
Connect (
+        a{sa{sv}}: connection
+        ) →
+        nothing

+        Tells the plugin to connect.
+      
Parameters
connection -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+          Describes the connection to be established.
+        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.(generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.(generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.(generic description)
NeedSecrets (
+        a{sa{sv}}: settings
+        ) →
+        s

+        Asks the plugin whether the provided connection will require secrets to connect successfully.
+      
Parameters
settings -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+          Describes the connection that may need secrets.
+        
Returns
setting_name -
+      s

+          The setting name within the provided connection that requires secrets, if any.
+        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.(generic description)
Disconnect (
+        
+        ) →
+        nothing

+        Disconnect the plugin.
+      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetIp4Config (
+        a{sv}: config
+        ) →
+        nothing

+        Set IPv4 details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Ip4Config details for the conneciton.
+        
SetFailure (
+        s: reason
+        ) →
+        nothing

+        Indicate a failure to the plugin.
+      
Parameters
reason -
+      s

+          The reason for the failure.
+        
Signals:
StateChanged (
+        u: state
+        )

+        Emitted when the plugin state changes.
+      
Parameters
state -
+      u
+      (NM_VPN_CONNECTION_STATE)
+    

+          The new state of the plugin.
+        
Ip4Config (
+        a{sv}: ip4config
+        )

+        The plugin obtained an IPv4 configuration.
+      
Parameters
ip4config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The IPv4 configuration.
+        
LoginBanner (
+        s: banner
+        )

+        Emitted when the plugin receives a login banner from the VPN service.
+      
Parameters
banner -
+      s

+          The login banner string.
+        
Failure (
+        u: reason
+        )

+        Emitted when a failure in the VPN plugin occurs.
+      
Parameters
reason -
+      u
+      (NM_VPN_PLUGIN_FAILURE)
+    

+          Reason code for the failure.
+        
Properties:
State -
+      u -
+      (read)
+      (NM_VPN_CONNECTION_STATE)
+    

+        The state of the plugin.
+      
Enumerated types:
NM_VPN_PLUGIN_FAILURE
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0

+          Login failed.
+        
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1

+          Connect failed.
+        
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

+          Invalid IP configuration returned from the VPN plugin.
+        

+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+        s: Key → v: Value
+        }
+      
A mapping from strings to variants representing extra
+      key-value pairs.
Members
Key -
+      s
(undocumented)
Value -
+      v
(undocumented)
String_String_Map - a{
+        s: Key → s: Value
+        }
+      
A mapping from strings to strings representing extra
+      key-value pairs.
Members
Key -
+      s
(undocumented)
Value -
+      s
(undocumented)
String_String_Variant_Map_Map - a{
+        s: Key → a{sv}: Value
+        }
+      
A mapping from strings to a map of string to variant.
Members
Key -
+      s
(undocumented)
Value -
+      a{sv}
+      (String_Variant_Map)
+    
(undocumented)
Errors:

+  
+
+  
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    
+
+  
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    
+
+  
org.freedesktop.NetworkManager.Error.PermissionDenied

+    User does not have the permission to activate this connection.
+    
+
+
Errors:

+  
org.freedesktop.NetworkManager.VPN.Error.General
This is a drab, nondescript error.
+  
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.
+  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.
+  
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.
+  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.
+  
org.freedesktop.NetworkManager.VPN.Error.WrongState
The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general?
+  
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.
+  
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
+  
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
+
Index
Index of interfaces
Index of types

diff --git a/docs/api/html/style.css b/docs/api/html/style.css
new file mode 100644
index 00000000..d6f6c26e
--- /dev/null
+++ b/docs/api/html/style.css
@@ -0,0 +1,266 @@
+.synopsis, .classsynopsis
+{
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  border: solid 1px #d3d7cf;
+  padding: 0.5em;
+}
+.programlisting
+{
+  /* tango:sky blue 0/1 */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
+  padding: 0.5em;
+}
+.variablelist
+{
+  padding: 4px;
+  margin-left: 3em;
+}
+.variablelist td:first-child
+{
+  vertical-align: top;
+}
+
+@media screen {
+  sup a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+    
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    display: inline-block;
+    position: relative;
+    top:-5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 3.2em;
+    padding-bottom: 20em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+    z-index: 10;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:scarlet red 3 */
+    color: #a40000;
+  }
+  .navigation a:hover
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+  }
+  td.shortcuts
+  {
+    /* tango:scarlet red 1 */
+    color: #ef2929;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    /* tango:scarlet red 0/1 */
+    background: #ffe6e6;
+    border: solid 1px #ef2929;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
+.navigation .title
+{
+  font-size: 200%;
+}
+
+div.gallery-float
+{
+  float: left;
+  padding: 10px;
+}
+div.gallery-float img
+{
+  border-style: none;
+}
+div.gallery-spacer
+{
+  clear: both;
+}
+
+a, a:visited
+{
+  text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
+}
+a:hover
+{
+  text-decoration: underline;
+  /* tango:sky blue 1 */
+  color: #729fcf;
+}
+
+div.table table
+{
+  border-collapse: collapse;
+  border-spacing: 0px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+}
+
+div.table table td, div.table table th
+{
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+  padding: 3px;
+  vertical-align: top;
+}
+
+div.table table th
+{
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
+}
+
+hr
+{
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  background: #babdb6;
+  border: none 0px;
+  height: 1px;
+  clear: both;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  text-align: center;
+  font-size: 80%;
+}
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  border-color: #ffb04f;
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  border-color: #abf562;
+}
+.note, .warning
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+}
+.note h3, .warning h3
+{
+  margin-top: 0.0em
+}
+.note p, .warning p
+{
+  margin-bottom: 0.0em
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+.annotation
+{
+  /* tango:aluminium 5 */
+  color: #555753;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+/* code listings */
+
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
diff --git a/docs/api/html/up.png b/docs/api/html/up.png
new file mode 100644
index 00000000..85b3e2a2
Binary files /dev/null and b/docs/api/html/up.png differ
diff --git a/docs/api/migrating-to-09.xml b/docs/api/migrating-to-09.xml
new file mode 100644
index 00000000..910c1369
--- /dev/null
+++ b/docs/api/migrating-to-09.xml
@@ -0,0 +1,476 @@
+
+
+]>
+
+  Migrating from NetworkManager 0.8 to NetworkManager 0.9
+
+  
+    NetworkManager 0.9 is a new major version of NetworkManager that breaks
+    both API and ABI compared to previous versions.  These changes are
+    intended to make communication with NetworkManager much simpler, especially
+    for network control and configuration programs.  Thankfully, most changes
+    are not difficult to implement, and the advantages of the simpler
+    architecture of NetworkManager 0.9 greatly outweight the effort of
+    updating client programs.
+  
+
+  

+    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
+    
+      Previously there were two "settings services", or D-Bus services that
+      provided and saved network configuration information.  NetworkManager
+      owned the "system" settings service, and one user-level applet owned the
+      "user" settings service.  Now, the "user" settings service has been
+      eliminated, so clients only have to track one D-Bus service to read and
+      update network configuration.  The functionality of the old user settings
+      service has been replaced with a "permissions" key on each connection
+      object to preserve the ability to restrict which users can use the
+      connection, and with a "secret agent" D-Bus API for user-session-level
+      secure storage of network secrets and passwords.
+    
+    
+      Elimination of the user settings service provides the following advantages
+      for clients of NetworkManager:
+      
+        Simpler discovery of network configuration and change tracking
+        Simpler storage of user-level network secrets by control applets
+        Correct operation of fast-user switching and multi-seat configurations
+        More granular network connection permissions for system administrators
+        Connections are now system-wide by default (unless restricted by the user or system administrator)
+        Easier deployment of user-specific connections (ie, VPNs)
+      
+    
+    
+      With this change, D-Bus methods that previously took a "service name"
+      argument (like
+      org.freedesktop.NetworkManager.ActivateConnection) and
+      objects with service name properties (like ActiveConnection objects) no
+      longer have those arguments or properties.
+    
+    
+      Action: if you develop a network control
+      applet that talks to NetworkManager and used to provide a user settings
+      service, you can eliminate that code and rely on NetworkManager for all
+      storage of network configuration.  Your applet should now implement the
+      Secret Agent D-Bus API (see below) to store user-specific secrets, and
+      add legacy user-specific configuration to NetworkManager when run.  More
+      information about both these changes follows.
+    
+    

+
+    

+    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
+      system-wide storage (and thus available to all users).  To allow this
+      functionality the concept of agents has been introduced.  Using the new
+      
+      org.freedesktop.NetworkManager.AgentManager
+      D-Bus interface provided by NetworkManager, user applications can register
+      themselves as "secret agents", ie programs capable of saving and providing
+      secrets to NetworkManager.  The agent should export the
+      
+      org.freedesktop.NetworkManager.SecretAgent
+      D-Bus interface, but should NOT claim a bus name on the system or session
+      bus.  Instead, NetworkManager talks to the agent directly over the D-Bus
+      connection which the agent used to register itself.
+    
+    
+      Each agent must send a unique identifier to NetworkManager when it
+      registers.  This identifier must follow certain rules (see the NM D-Bus
+      API documentation for more details) but looks essentially the same as
+      a D-Bus service name.  Only one agent using a given identifier may be
+      registered at the same time.  The agent is automatically unregistered
+      if it disconnects from D-Bus or exits.
+    
+    
+      When NetworkManager requires secrets during the attempt to connect to a
+      network, and no secrets are available from the internal settings service,
+      NetworkManager queries each registered agent for secrets.  Agents that
+      are in "active" user sessions (as determined by ConsoleKit) are preferred
+      over inactive ones.  Only agents belonging to users who have permission
+      to view and modify the connection are queried.  For more information on
+      connection permissions, see below.
+    
+      When secrets are requested, the agent is also sent a set of flags that
+      modify the behavior of the request.  By default, the agent should never
+      attempt to query the user for secrets, but should simply return any
+      available saved secrets.  Other flags allow the agent to explicitly
+      request new secrets from the user.
+    
+      Action: the parts of a previous user
+      settings service that handled secrets may be easily repurposed as the bulk
+      of the implementation of a secret agent.  The agent is sent all available
+      connection settings, and from those should be able to retrieve or save
+      any saved user secrets, or to request new secrets from the user.
+    
+    

+
+    

+    Settings Service Interface Changes
+    
+      With the elimination of the user settings service, the old
+      org.freedesktop.NetworkManagerUserSettings and
+      org.freedesktop.NetworkManagerSystemSettings D-Bus
+      service names are no longer used.  Instead NetworkManager provides the
+      settings service using its own D-Bus service name,
+      org.freedesktop.NetworkManager.  The object path of
+      the settings service remains unchanged.
+    
+    
+      Additionally, the D-Bus interface of the settings service has changed
+      to 
+      org.freedesktop.NetworkManager.Settings from
+      the old interface name of
+      org.freedesktop.NetworkManagerSettings, and the old
+      org.freedesktop.NetworkManagerSettings.System
+      interface has been merged into the new
+      
+      org.freedesktop.NetworkManager.Settings interface
+      as the split no longer made sense. This includes the
+      SaveHostname method and the Hostname
+      and CanModify properties.
+    
+    
+      Action: change the service name that
+      your application uses to request system network settings to
+      org.freedesktop.NetworkManager, and update the D-Bus
+      interface that codes uses to talk to the settings service to
+      
+      org.freedesktop.NetworkManager.Settings.
+      Listen for hostname changes using the new interface name as well.
+    
+    

+
+    

+    Connection Object Interface Changes
+    
+      Consistent with the interface changes to the Settings object, the
+      Connection object's D-Bus interface has changed to
+      
+      org.freedesktop.NetworkManager.Settings.Connection
+      from the previous 
+      org.freedesktop.NetworkManagerSettings.Connection.
+    
+    
+      Additionally, the
+      org.freedesktop.NetworkManager.Settings.Connection.Updated
+      signal of the Connection object no longer includes the updated settings
+      data argument, as that might allow users who are not authorized to
+      view the connection details to do so.  Instead, when a client receives the
+      Updated signal, it should requery the Connection's settings with the
+      org.freedesktop.NetworkManager.Settings.Connection.GetSettings
+      method.  If the client receives an error as a result of this method call,
+      it should assume the connection has been deleted.
+    
+    
+      Action: where code manipulates
+      Connection objects, update the D-Bus interface that code uses to be
+      org.freedesktop.NetworkManager.Settings.Connection.
+      Additionally, code that listens for the
+      org.freedesktop.NetworkManager.Settings.Connection.Updated
+      signal should no longer expect the new settings data as an argument, but
+      instead should request the new settings data using the
+      org.freedesktop.NetworkManager.Settings.Connection.GetSettings
+      method.
+    
+    

+
+    

+    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
+      callers that they should recheck permissions.  Those two calls were:
+      
+        
+          org.freedesktop.NetworkManagerSettings.System.GetPermissions
+          which returned a bitfield of operations the caller was allowed to
+          perform related to modify system network settings and the machine
+          hostname
+        
+        
+          org.freedesktop.NetworkManager.GetPermissions which
+          returned a dictionary mapping permission names to result strings like
+          "yes", "auth", or "no", relating to network control permissions like
+          the ability to enable or disable WiFi.
+        
+      
+      These two calls have been consolidated into an enhanced
+      org.freedesktop.NetworkManager.GetPermissions call that
+      uses the same arguments, but includes all permissions, including those which
+      the settings service used to handle.
+    
+    
+      With this change, the bitfield items from
+      org.freedesktop.NetworkManagerSettings.System.GetPermissions
+      are now string-based permissions.  The mapping is as follows:
+      
+        
+          
+            Old bitfield valueNew permission name
+          
+          
+            
+              0x1 (connection-modify)
+              
+                org.freedesktop.NetworkManager.settings.modify.system
+                or org.freedesktop.NetworkManager.settings.modify.system
+                depending on the permissions of the connection.
+              
+            
+            
+              0x2 (wifi-share-protected)
+              
+                org.freedesktop.NetworkManager.wifi.share.protected
+              
+            
+            
+              0x4 (wifi-share-open)
+              
+                org.freedesktop.NetworkManager.wifi.share.open
+              
+            
+            
+              0x8 (hostname-modify)
+              
+                org.freedesktop.NetworkManager.settings.modify.hostname
+              
+            
+          
+        
+      

+    
+    
+      Action: modify handling of existing
+      code that checks permissions to recognize the new permissions names for
+      old system settings permissions, and remove code that used to call
+      org.freedesktop.NetworkManagerSettings.System.GetPermissions.
+    
+    

+
+    

+    AddConnection Returns Object Path of New Connection
+    
+      The 
+      org.freedesktop.NetworkManager.Settings.AddConnection
+       method call now returns the object path of the newly added
+      connection. Previously, if code wanted to manipulate a connection
+      post-addition, it had to wait for the new connection to be announced via
+      the NewConnection signal by matching connection UUIDs.  Now the object
+      path is returned and this workaround is no longer required.
+    
+    
+      Action: update code that adds new
+      connections to handle the object path returned from AddConnection, and
+      remove workarounds for finding the new connection via signals.
+    
+    

+
+    

+    Support for WiMAX Devices
+    
+      NetworkManager now supports Intel WiMAX mobile broadband devices.  A
+      corresponding device type (NM_DEVICE_TYPE_WIMAX) and
+      a new 
+      org.freedesktop.NetworkManager.Device.WiMax
+      D-Bus interface have been added.  Furthermore, to support connection to
+      different WiMAX Network Service Providers (NSPs) the
+      
+      org.freedesktop.NetworkManager.Device.WiMax.Nsp
+      interface has been added to access information about each available
+      WiMAX network.
+    
+    
+      Action: update code that handles
+      devices and/or displays status to users to recognize the new device type,
+      and to display available WiMAX NSPs similar to how WiFi Access Points
+      are displayed. Also update code that creates new connections to allow
+      creation of new WiMAX connections.
+    
+    

+
+    

+    New Device States
+    
+      A few new device states
+      have been added, and all device states have been renumbered for flexibility.
+      The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING.
+    
+    
+      Action: where code checks device state
+      or shows UI indication of the device's state, make sure the new device
+      states are processed correctly, and that code in switch()-type statements
+      is updated to handle the new states.
+    
+    

+
+    

+    New Active Connection State
+    
+      Along with the new device states, an
+      additional
+      ActiveConnection state has been added: DEACTIVATING.  This state
+      is entered when the connection is being torn down and deactivated.
+    
+    
+      Action: where code checks active
+      connection states or shows UI indication of active connection states, make
+      sure the DEACTIVATING state is processed correctly, and that code in
+      switch()-type statements is updated to handle it.
+    
+    

+
+    

+    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
+      or UMTS/LTE modems like the Pantech UML290.  The previous hard split
+      between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to
+      deal with these new multi-mode devices.  Thus the previously separate
+      CDMA and GSM device classes have been combined into a single Modem
+      device class, which exposes both hardware "ModemCapabilities" and
+      runtime "CurrentCapabilities" which represent generic access technology
+      families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports.
+      ModemCapabilities indicate all the access technology families which the
+      modem is capable of supporting, while CurrentCapabilities indicate the
+      immediate access technology families the device supports without reloading
+      the firmware and thus restarting the device.
+    
+    
+      Along with this change, the
+      org.freedesktop.NetworkManager.Device.Serial
+      interface has been removed as it's functionality will be incorporated
+      into the 
+      
+      org.freedesktop.NetworkManager.Device.Modem
+      interface in the future.
+    
+    
+      Action: combine code that checks for
+      the old CDMA and GSM device types, and instead handle the new Modem device
+      type.  Where behavior must change based on the capabilities of the device,
+      check the CurrentCapabilities device property to determine whether to
+      treat the device as CDMA, GSM, or LTE for purposes of configuration and
+      status.
+    
+    

+
+    

+    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
+      an associated "flags" property that changes how NetworkManager treats the
+      secret.  The "flags" property is a bitfield of one or more of the
+      following values:
+      
+        
+          
+            Flag ValueMeaning
+          
+          
+            
+              0x00 (none)
+              
+                NetworkManager is responsible for providing and storing this
+                secret (default)
+              
+            
+            
+              0x01 (agent-owned)
+              
+                A user secret agent is responsible for providing and storing
+                this secret; when it is required agents will be asked to
+                retrieve it
+              
+            
+            
+              0x02 (not saved)
+              
+                The secret is not saved, and should be requested each time it
+                is required.  Used for OTP/token configurations where the
+                secret changes periodically, or if the user simply wants to
+                manually enter the secret each time.
+              
+            
+            
+              0x04 (not required)
+              
+                In situations where it cannot be automatically determined that
+                the secret is required (some VPNs and PPP providers dont require
+                all possible secrets) this flag indicates that the specific
+                secret is not required.
+              
+            
+          
+        
+      

+    
+    
+      Action: user interface code which
+      handles entry of connection secrets should be updated to read and set
+      secret flags.  For example, code that creates new VPN connections may want
+      to set the "agent-owned" flag to ensure that the user's VPN password is
+      not available to all users.  EAP-TLS and VPN interface code might add a
+      checkbox that toggles the "not saved" bit to indicate that the
+      password/PIN code should be requested from a hardware token each time it
+      is required.
+    
+    

+
+    

+    Deprecated Methods Removed
+    
+      A few methods and signals of the org.freedesktop.NetworkManager
+      interface deprecated in version 0.7 have been removed.  All the
+      replacement methods and signals have existed since version 0.7 and so are
+      not new to this version of NetworkManager, but some older programs may
+      be using removed items.  The following table lists the removed items and
+      their replacements:
+      
+        
+          
+            Removed ItemReplacement
+          
+          
+            
+              StateChange signal
+              
+                Use the StateChanged signal, which has the
+                same arguments.
+              
+            
+            
+              sleep() and wake() methods
+              
+                Use the Sleep() method instead, which takes
+                a boolean argument indicating whether NetworkManager should
+                go to sleep or wake up.
+              
+            
+          
+        
+      

+    
+    
+      Action: update code to use these
+      replacement methods and properties where it used old deprecated ones
+    
+    

+
+  

+
+
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
new file mode 100644
index 00000000..885ff7f1
--- /dev/null
+++ b/docs/api/network-manager-docs.xml
@@ -0,0 +1,129 @@
+
+
+]>
+
+  
+    NetworkManager D-Bus Reference Manual
+    Version &version;
+    
+      
+	Dan
+	Williams
+	
+	  

+	    dcbw@redhat.com
+	  

+	
+      
+    
+
+    
+      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
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the GNU Free
+	Documentation License from the Free Software
+	Foundation by visiting their Web site or by writing
+	to:
+
+	

+	  The Free Software Foundation, Inc.,
+	  59 Temple Place - Suite 330,
+	  Boston, MA 02111-1307,
+	  USA
+	

+      
+
+      
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      
+    
+  
+
+  
+    D-Bus API Reference
+    
+      This part documents the D-Bus interface used to access the
+      NetworkManager daemon.
+    
+    
+  
+
+  
+    Network Configuration Setting Specification
+    
+      This part documents the properties and value types of each "Setting"
+      object that composes the basic unit of NetworkManager configuration,
+      the "Connection".  Each Connection object is simply a dictionary mapping
+      setting names (like "wimax" or "bluetooth") to a dictionary of
+      key/value pairs that represents each itself.
+    
+    
+    

+      Secret flag types
+      
+        Each secret property in a setting has an associated "flags" property
+        that describes how to handle that secret.  The "flags" property is a
+        bitfield that contains zero or more of the following values logically
+        OR-ed together.
+      
+      
+        
+          
+            0x0 (none) - the system is responsible for providing
+            and storing this secret.
+          
+          
+            0x1 (agent-owned) - a user-session secret agent
+            is responsible for providing and storing this secret; when it is
+            required, agents will be asked to provide it.
+          
+          
+            0x2 (not-saved) - this secret should not be saved
+            but should be requested from the user each time it is required. This
+            flag should be used for One-Time-Pad secrets, PIN codes from
+            hardware tokens, or if the user simply does not want to save the
+            secret.
+          
+          
+            0x4 (not-required) - in some situations it cannot
+            be automatically determined that a secret is required or not.  This
+            flag hints that the secret is not required and should not be
+            requested from the user.
+          
+        
+      
+    

+  
+
+  
+
+  
+    Index
+  
+
+  
+
+  
+    License
+    
+FIXME: MISSING XINCLUDE CONTENT
+    
+  
+
+
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
new file mode 100644
index 00000000..6be79b15
--- /dev/null
+++ b/docs/api/settings-spec.xml
@@ -0,0 +1,1202 @@
+
+]>

+  Configuration Settings
+  
+
+  802-1x setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-1x
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        eap
+        array of string
+        []
+        The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
+      
+      
+        identity
+        string
+        
+        Identity string for EAP authentication methods.  Often the user's user or login name.
+      
+      
+        anonymous-identity
+        string
+        
+        Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
+      
+      
+        ca-cert
+        byte array
+        []
+        Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+      
+      
+        ca-path
+        string
+        
+        UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.
+      
+      
+        client-cert
+        byte array
+        []
+        Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
+      
+      
+        phase1-peapver
+        string
+        
+        Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.
+      
+      
+        phase1-peaplabel
+        string
+        
+        Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
+      
+      
+        phase1-fast-provisioning
+        string
+        
+        Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
+      
+      
+        phase2-auth
+        string
+        
+        Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+      
+      
+        phase2-autheap
+        string
+        
+        Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+      
+      
+        phase2-ca-cert
+        byte array
+        []
+        Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+      
+      
+        phase2-ca-path
+        string
+        
+        UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.
+      
+      
+        phase2-client-cert
+        byte array
+        []
+        Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
+      
+      
+        password
+        string
+        
+        Password used for EAP authentication methods.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x password. (see  for flag values)
+      
+      
+        private-key
+        byte array
+        []
+        Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
+      
+      
+        private-key-password
+        string
+        
+        The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
+      
+      
+        private-key-password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x private key password. (see  for flag values)
+      
+      
+        phase2-private-key
+        byte array
+        []
+        Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
+      
+      
+        phase2-private-key-password
+        string
+        
+        The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.
+      
+      
+        phase2-private-key-password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x phase2 private key password. (see  for flag values)
+      
+      
+        system-ca-certs
+        boolean
+        FALSE
+        When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.
+      
+    
+  
+

+
+  bluetooth setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bluetooth
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        bdaddr
+        byte array
+        []
+        The Bluetooth address of the device
+      
+      
+        type
+        string
+        
+        Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.
+      
+    
+  
+

+
+  cdma setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        cdma
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        number
+        string
+        
+        Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the CDMA password. (see  for flag values)
+      
+    
+  
+

+
+  connection setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        connection
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        id
+        string
+        
+        User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.
+      
+      
+        uuid
+        string
+        
+        Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.
+      
+      
+        type
+        string
+        
+        Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).
+      
+      
+        permissions
+        array of string
+        []
+        An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the 'user' [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ':' character.  Any [reserved] information (if present) must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+      
+      
+        autoconnect
+        boolean
+        TRUE
+        If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.
+      
+      
+        timestamp
+        uint64
+        0
+        Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.
+      
+      
+        read-only
+        boolean
+        FALSE
+        If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.
+      
+    
+  
+

+
+  gsm setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        gsm
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        number
+        string
+        
+        Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the GSM password. (see  for flag values)
+      
+      
+        apn
+        string
+        
+        The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
+      
+      
+        network-id
+        string
+        
+        The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
+      
+      
+        network-type
+        int32
+        -1
+        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.
+      
+      
+        pin
+        string
+        
+        If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
+      
+      
+        pin-flags
+        uint32
+        0
+        Flags indicating how to handle the GSM SIM PIN. (see  for flag values)
+      
+      
+        allowed-bands
+        uint32
+        1
+        Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.
+      
+      
+        home-only
+        boolean
+        FALSE
+        When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.
+      
+    
+  
+

+
+  ipv4 setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ipv4
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        method
+        string
+        
+        IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.
+      
+      
+        dns
+        array of uint32
+        []
+        List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
+      
+      
+        dns-search
+        array of string
+        []
+        List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
+      
+      
+        addresses
+        array of array of uint32
+        []
+        Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.
+      
+      
+        routes
+        array of array of uint32
+        []
+        Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.
+      
+      
+        ignore-auto-routes
+        boolean
+        FALSE
+        When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
+      
+      
+        ignore-auto-dns
+        boolean
+        FALSE
+        When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
+      
+      
+        dhcp-client-id
+        string
+        
+        A string sent to the DHCP server to identify the local machine which the DHCP server may use to cusomize the DHCP lease and options.
+      
+      
+        dhcp-send-hostname
+        boolean
+        TRUE
+        If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.
+      
+      
+        dhcp-hostname
+        string
+        
+        If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.
+      
+      
+        never-default
+        boolean
+        FALSE
+        If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.
+      
+      
+        may-fail
+        boolean
+        FALSE
+        If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
+      
+    
+  
+

+
+  ipv6 setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ipv6
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        method
+        string
+        
+        IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
+      
+      
+        dns
+        array of byte array
+        []
+        Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
+      
+      
+        dns-search
+        array of string
+        []
+        List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
+      
+      
+        addresses
+        array of (byte array, uint32, byte array)
+        []
+        Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.
+      
+      
+        routes
+        array of (byte array, uint32, byte array, uint32)
+        []
+        Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.
+      
+      
+        ignore-auto-routes
+        boolean
+        FALSE
+        When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
+      
+      
+        ignore-auto-dns
+        boolean
+        FALSE
+        When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
+      
+      
+        never-default
+        boolean
+        FALSE
+        If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.
+      
+      
+        may-fail
+        boolean
+        FALSE
+        If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.
+      
+    
+  
+

+
+  802-11-olpc-mesh setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-olpc-mesh
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        ssid
+        byte array
+        []
+        SSID of the mesh network to join.
+      
+      
+        channel
+        uint32
+        0
+        Channel on which the mesh network to join is located.
+      
+      
+        dhcp-anycast-address
+        byte array
+        []
+        Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.
+      
+    
+  
+

+
+  ppp setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ppp
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        noauth
+        boolean
+        TRUE
+        If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
+      
+      
+        refuse-eap
+        boolean
+        FALSE
+        If TRUE, the EAP authentication method will not be used.
+      
+      
+        refuse-pap
+        boolean
+        FALSE
+        If TRUE, the PAP authentication method will not be used.
+      
+      
+        refuse-chap
+        boolean
+        FALSE
+        If TRUE, the CHAP authentication method will not be used.
+      
+      
+        refuse-mschap
+        boolean
+        FALSE
+        If TRUE, the MSCHAP authentication method will not be used.
+      
+      
+        refuse-mschapv2
+        boolean
+        FALSE
+        If TRUE, the MSCHAPv2 authentication method will not be used.
+      
+      
+        nobsdcomp
+        boolean
+        FALSE
+        If TRUE, BSD compression will not be requested.
+      
+      
+        nodeflate
+        boolean
+        FALSE
+        If TRUE, 'deflate' compression will not be requested.
+      
+      
+        no-vj-comp
+        boolean
+        FALSE
+        If TRUE, Van Jacobsen TCP header compression will not be requested.
+      
+      
+        require-mppe
+        boolean
+        FALSE
+        If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
+      
+      
+        require-mppe-128
+        boolean
+        FALSE
+        If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
+      
+      
+        mppe-stateful
+        boolean
+        FALSE
+        If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
+      
+      
+        crtscts
+        boolean
+        FALSE
+        If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
+      
+      
+        baud
+        uint32
+        0
+        If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
+      
+      
+        mru
+        uint32
+        0
+        If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, instruct pppd to send packets no larger than the specified size.
+      
+      
+        lcp-echo-failure
+        uint32
+        0
+        If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.
+      
+      
+        lcp-echo-interval
+        uint32
+        0
+        If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
+      
+    
+  
+

+
+  pppoe setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        pppoe
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        service
+        string
+        
+        If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the PPPoE service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the PPPoE service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the PPPoE password. (see  for flag values)
+      
+    
+  
+

+
+  serial setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        serial
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        baud
+        uint32
+        57600
+        Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
+      
+      
+        bits
+        uint32
+        8
+        Byte-width of the serial communication.  The 8 in '8n1' for example.
+      
+      
+        parity
+        gchar
+        110
+        Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.
+      
+      
+        stopbits
+        uint32
+        1
+        Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.
+      
+      
+        send-delay
+        uint64
+        0
+        Time to delay between each byte sent to the modem, in microseconds.
+      
+    
+  
+

+
+  vpn setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        vpn
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        service-type
+        string
+        
+        D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
+      
+      
+        user-name
+        string
+        
+        User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.
+      
+      
+        data
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
+      
+      
+        secrets
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
+      
+    
+  
+

+
+  wimax setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        wimax
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        network-name
+        string
+        
+        Network Service Provider (NSP) name of the WiMAX network this connection should use.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).
+      
+    
+  
+

+
+  802-3-ethernet setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-3-ethernet
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        port
+        string
+        
+        Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.
+      
+      
+        speed
+        uint32
+        0
+        If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.
+      
+      
+        duplex
+        string
+        
+        If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.
+      
+      
+        auto-negotiate
+        boolean
+        TRUE
+        If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        cloned-mac-address
+        byte array
+        []
+        If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+      
+      
+        s390-subchannels
+        GPtrArray_gchararray_
+        []
+        Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
+      
+      
+        s390-nettype
+        string
+        
+        s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.
+      
+      
+        s390-options
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.
+      
+    
+  
+

+
+  802-11-wireless setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-wireless
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        ssid
+        byte array
+        []
+        SSID of the WiFi network.  Must be specified.
+      
+      
+        mode
+        string
+        
+        WiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.
+      
+      
+        band
+        string
+        
+        802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
+      
+      
+        channel
+        uint32
+        0
+        Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.
+      
+      
+        bssid
+        byte array
+        []
+        If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
+      
+      
+        rate
+        uint32
+        0
+        If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
+      
+      
+        tx-power
+        uint32
+        0
+        If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        cloned-mac-address
+        byte array
+        []
+        If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+      
+      
+        seen-bssids
+        array of string
+        []
+        A list of BSSIDs (each BSSID formatted as a MAC address like '00:11:22:33:44:55') that have been detected as part of the WiFI network.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.
+      
+      
+        security
+        string
+        
+        If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.
+      
+    
+  
+

+
+  802-11-wireless-security setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-wireless-security
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        key-mgmt
+        string
+        
+        Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.
+      
+      
+        wep-tx-keyidx
+        uint32
+        0
+        When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
+      
+      
+        auth-alg
+        string
+        
+        When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.
+      
+      
+        proto
+        array of string
+        []
+        List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
+      
+      
+        pairwise
+        array of string
+        []
+        If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
+      
+      
+        group
+        array of string
+        []
+        If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
+      
+      
+        leap-username
+        string
+        
+        The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
+      
+      
+        wep-key0
+        string
+        
+        Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key1
+        string
+        
+        Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key2
+        string
+        
+        Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key3
+        string
+        
+        Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key-flags
+        uint32
+        0
+        Flags indicating how to handle the WEP keys. (see  for flag values)
+      
+      
+        wep-key-type
+        uint32
+        0
+        Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.
+      
+      
+        psk
+        string
+        
+        Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.
+      
+      
+        psk-flags
+        uint32
+        0
+        Flags indicating how to handle the WPA PSK key. (see  for flag values)
+      
+      
+        leap-password
+        string
+        
+        The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
+      
+      
+        leap-password-flags
+        uint32
+        0
+        Flags indicating how to handle the LEAP password. (see  for flag values)
+      
+    
+  
+

+  
+

diff --git a/docs/api/spec.html b/docs/api/spec.html
new file mode 100644
index 00000000..5bb127d4
--- /dev/null
+++ b/docs/api/spec.html
@@ -0,0 +1,1390 @@
+
+NetworkManager D-Bus Interface Specification version 0.9
NetworkManager D-Bus Interface Specification
Version 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.

+
Interfaces

+  
org.freedesktop.NetworkManager
Methods:
GetDevices (
+        
+        ) →
+        ao

+        Get the list of network devices.
+      
Returns
devices -
+      ao

+          List of object paths of network devices known to the system.
+        
GetDeviceByIpIface (
+        s: iface
+        ) →
+        o

+        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.
+      
Parameters
iface -
+      s

+          Interface name of the device to find.
+        
Returns
device -
+      o

+          Object path of the network device.
+        
ActivateConnection (
+        o: connection, o: device, o: specific_object
+        ) →
+        o

+        Activate a connection using the supplied device.
+      
Parameters
connection -
+      o

+          The connection to activate the devices with.
+        
device -
+      o

+          The object path of device to be activated for physical connections.  This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+        
specific_object -
+      o

+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, or "/" to pick and AP automatically.  For VPN connections, pass
+          the object path of an ActiveConnection object that should serve as the
+          "base" connection (to which the VPN connections lifetime will be tied),
+          or pass "/" and NM will automatically use the current default device.
+        
Returns
active_connection -
+      o

+          The path of the active connection object representing this active connection.
+        
Possible errors
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    (generic description)
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    (generic description)
org.freedesktop.NetworkManager.Error.ConnectionActivating
Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?
org.freedesktop.NetworkManager.Error.ConnectionInvalid
The connection is invalid for this device.
AddAndActivateConnection (
+        a{sa{sv}}: connection, o: device, o: specific_object
+        ) →
+        o, o

+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      
Parameters
connection -
+      a{sa{sv}}

+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        
device -
+      o

+          The object path of device to be activated using the given connection.
+        
specific_object -
+      o

+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        
Returns
path -
+      o

+          Object path of the new connection that was just added.
+        
active_connection -
+      o

+          The path of the active connection object representing this active connection.
+        
Possible errors
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    (generic description)
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    (generic description)
org.freedesktop.NetworkManager.Error.ConnectionInvalid
The connection is invalid for this device.
DeactivateConnection (
+        o: active_connection
+        ) →
+        nothing

+        Deactivate an active connection.
+      
Parameters
active_connection -
+      o

+          The currently active connection to deactivate.
+        
Sleep (
+        b: sleep
+        ) →
+        nothing

+        Control the NetworkManager daemon's sleep state.  When asleep, all
+        interfaces that it manages are deactivated.  When awake, devices are
+        available to be activated.  This command should not be called directly
+        by users or clients; it is intended for system suspend/resume tracking.
+      
Parameters
sleep -
+      b

+          Indicates whether the NetworkManager daemon should sleep or wake.
+        
Enable (
+        b: enable
+        ) →
+        nothing

+        Control whether overall networking is enabled or disabled.  When
+        disabled, all interfaces that NM manages are deactivated.  When enabled,
+        all managed interfaces are re-enabled and available to be activated.
+        This command should be used by clients that provide to users the ability
+        to enable/disable all networking.
+      
Parameters
enable -
+      b

+          If FALSE, indicates that all networking should be disabled.  If TRUE,
+          indicates that NetworkManager should begin managing network devices.
+        
GetPermissions (
+        
+        ) →
+        a{ss}

+        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        WiFi, WWAN, and WiMAX state, etc.
+      
Returns
permissions -
+      a{ss}

+          Dictionary of available permissions and results.  Each permission
+          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
+          and each result is one of the following values: "yes" (the permission
+          is available), "auth" (the permission is available after a successful
+          authentication), or "no" (the permission is denied).  Clients may use
+          these values in the UI to indicate the ability to perform certain
+          operations.
+        
SetLogging (
+        s: level, s: domains
+        ) →
+        nothing

+        Set logging verbosity and which operations are logged.
+      
Parameters
level -
+      s

+          One of [ERR, WARN, INFO, DEBUG].
+        
domains -
+      s

+          A combination of logging domains separated by commas (','), or "NONE"
+          to disable logging.  Each domain enables logging for operations
+          related to that domain.  Available domains are: [NONE, HW, RFKILL,
+          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
+          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
+          DEVICE, OLPC]
+        
state (
+        
+        ) →
+        u

+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under it's management.
+      
Returns
state -
+      u
+      (NM_STATE)
+    
Signals:
CheckPermissions (
+        
+        )

+        Emitted when system authorization details change, indicating that
+        clients may wish to recheck permissions with GetPermissions.
+      
StateChanged (
+        u: state
+        )

+        NetworkManager's state changed.
+      
Parameters
state -
+      u
+      (NM_STATE)
+    

+          The new state of NetworkManager.
+        
PropertiesChanged (
+        a{sv}: properties
+        )

+        NetworkManager's properties changed.
+      
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+          The changed properties.
+        
DeviceAdded (
+        o: device_path
+        )

+        A device was added to the system
+      
Parameters
device_path -
+      o

+          The object path of the newly added device.
+        
DeviceRemoved (
+        o: device_path
+        )

+        A device was removed from the system, and is no longer available.
+      
Parameters
device_path -
+      o

+          The object path of the device that was just removed.
+        
Properties:
NetworkingEnabled -
+      b -
+      (read)

+        Indicates if overall networking is currently enabled or not.  See the
+        Enable() method.
+      
WirelessEnabled -
+      b -
+      (readwrite)

+        Indicates if wireless is currently enabled or not.
+      
WirelessHardwareEnabled -
+      b -
+      (read)

+        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
+      
WwanEnabled -
+      b -
+      (readwrite)

+        Indicates if mobile broadband devices are currently enabled or not.
+      
WwanHardwareEnabled -
+      b -
+      (read)

+        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+      
WimaxEnabled -
+      b -
+      (readwrite)

+        Indicates if WiMAX devices are currently enabled or not.
+      
WimaxHardwareEnabled -
+      b -
+      (read)

+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      
ActiveConnections -
+      ao -
+      (read)

+        List of active connection object paths.
+      
Version -
+      s -
+      (read)

+        NetworkManager version.
+      
State -
+      u -
+      (read)
+      (NM_STATE)
+    

+        The overall state of the NetworkManager daemon.
+      
Enumerated types:
NM_STATE

+        Describes the overall state of the daemon.
+      
NM_STATE_UNKNOWN = 0

+          Networking state is unknown.
+        
NM_STATE_ASLEEP = 10

+          Networking is inactive and all devices are disabled.
+        
NM_STATE_DISCONNECTED = 20

+          There is no active network connection.
+        
NM_STATE_DISCONNECTING = 30

+          Network connections are being cleaned up.
+        
NM_STATE_CONNECTING = 40

+          A network device is connecting to a network and there is no other
+          available network connection.
+        
NM_STATE_CONNECTED_LOCAL = 50

+          A network device is connected, but there is only link-local connectivity.
+        
NM_STATE_CONNECTED_SITE = 60

+          A network device is connected, but there is only site-local connectivity.
+        
NM_STATE_CONNECTED_GLOBAL = 70

+          A network device is connected, with global network connectivity.
+        

+
+  
org.freedesktop.NetworkManager.AccessPoint
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Flags -
+      u -
+      (read)
+      (NM_802_11_AP_FLAGS)
+    
Flags describing the capabilities of the access point.
WpaFlags -
+      u -
+      (read)
+      (NM_802_11_AP_SEC)
+    
Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
RsnFlags -
+      u -
+      (read)
+      (NM_802_11_AP_SEC)
+    
Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
Ssid -
+      ay -
+      (read)
The Service Set Identifier identifying the access point.
Frequency -
+      u -
+      (read)
The radio channel frequency in use by the access point, in MHz.
HwAddress -
+      s -
+      (read)
The hardware address (BSSID) of the access point.
Mode -
+      u -
+      (read)
+      (NM_802_11_MODE)
+    
Describes the operating mode of the access point.
MaxBitrate -
+      u -
+      (read)
The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
Strength -
+      y -
+      (read)
The current signal quality of the access point, in percent.
Sets of flags:
NM_802_11_AP_FLAGS

+        Flags describing the general capabilities of the access point.
+      
NM_802_11_AP_FLAGS_NONE = 0x0
Null capability - says nothing about the access point.
NM_802_11_AP_FLAGS_PRIVACY = 0x1
Access point supports privacy measures.
NM_802_11_AP_SEC

+        Flags describing the security capabilities of the access point.
+      
NM_802_11_AP_SEC_NONE = 0x0
Null flag.
NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
Access point supports pairwise 40-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
Access point supports pairwise 104-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_TKIP = 0x4
Access point supports pairwise TKIP encryption.
NM_802_11_AP_SEC_PAIR_CCMP = 0x8
Access point supports pairwise CCMP encryption.
NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
Access point supports a group 40-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
Access point supports a group 104-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_TKIP = 0x40
Access point supports a group TKIP cipher.
NM_802_11_AP_SEC_GROUP_CCMP = 0x80
Access point supports a group CCMP cipher.
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
Access point supports PSK key management.
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
Access point supports 802.1x key management.

+
+  
org.freedesktop.NetworkManager.Device
Methods:
Disconnect (
+        
+        ) →
+        nothing

+        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
+      
Signals:
StateChanged (
+        u: new_state, u: old_state, u: reason
+        )
Parameters
new_state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The new state of the device.
+        
old_state -
+      u
+      (NM_DEVICE_STATE)
+    

+          The previous state of the device.
+        
reason -
+      u
+      (NM_DEVICE_STATE_REASON)
+    

+          A reason for the state transition.
+        
Properties:
Udi -
+      s -
+      (read)

+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
+      
Interface -
+      s -
+      (read)

+        The name of the device's control (and often data) interface.
+      
IpInterface -
+      s -
+      (read)

+        The name of the device's data interface when available.  This property
+        may not refer to the actual data interface until the device has
+        successfully established a data connection, indicated by the device's
+        State becoming ACTIVATED.
+      
Driver -
+      s -
+      (read)

+        The driver handling the device.
+      
Capabilities -
+      u -
+      (read)
+      (NM_DEVICE_CAP)
+    

+        Flags describing the capabilities of the device.
+      
Ip4Address -
+      i -
+      (read)

+        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
+      
State -
+      u -
+      (read)
+      (NM_DEVICE_STATE)
+    

+        The current state of the device.
+      
Ip4Config -
+      o -
+      (read)

+        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Dhcp4Config -
+      o -
+      (read)

+        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Ip6Config -
+      o -
+      (read)

+        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+      
Dhcp6Config -
+      o -
+      (read)

+        Object path of the Dhcp6Config object describing the DHCP options
+        returned by the DHCP server.  Only valid when the device is in the
+        NM_DEVICE_STATE_ACTIVATED state.
+      
Managed -
+      b -
+      (read)

+        Whether or not this device is managed by NetworkManager.
+      
FirmwareMissing -
+      b -
+      (read)

+        If TRUE, indicates the device is likely missing firmware necessary for
+        its operation.
+      
DeviceType -
+      u -
+      (read)
+      (NM_DEVICE_TYPE)
+    

+        The general type of the network device; ie Ethernet, WiFi, etc.
+      
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

+          The device is in an unknown state.
+        
NM_DEVICE_STATE_UNMANAGED = 10

+          The device is recognized but not managed by NetworkManager.
+        
NM_DEVICE_STATE_UNAVAILABLE = 20

+          The device cannot be used (carrier off, rfkill, etc).
+        
NM_DEVICE_STATE_DISCONNECTED = 30

+          The device is not connected.
+        
NM_DEVICE_STATE_PREPARE = 40

+          The device is preparing to connect.
+        
NM_DEVICE_STATE_CONFIG = 50

+          The device is being configured.
+        
NM_DEVICE_STATE_NEED_AUTH = 60

+          The device is awaiting secrets necessary to continue connection.
+        
NM_DEVICE_STATE_IP_CONFIG = 70

+          The IP settings of the device are being requested and configured.
+        
NM_DEVICE_STATE_IP_CHECK = 80

+          The device's IP connectivity ability is being determined.
+        
NM_DEVICE_STATE_SECONDARIES = 90

+          The device is waiting for secondary connections to be activated.
+        
NM_DEVICE_STATE_ACTIVATED = 100

+          The device is active.
+        
NM_DEVICE_STATE_DEACTIVATING = 110

+          The device's network connection is being torn down.
+        
NM_DEVICE_STATE_FAILED = 120

+          The device is in a failure state following an attempt to activate it.
+        
NM_DEVICE_TYPE
NM_DEVICE_TYPE_UNKNOWN = 0

+          The device type is unknown.
+        
NM_DEVICE_TYPE_ETHERNET = 1

+          The device is wired Ethernet device.
+        
NM_DEVICE_TYPE_WIFI = 2

+          The device is an 802.11 WiFi device.
+        
NM_DEVICE_TYPE_UNUSED1 = 3
Unused
NM_DEVICE_TYPE_UNUSED2 = 4
Unused
NM_DEVICE_TYPE_BT = 5

+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        
NM_DEVICE_TYPE_OLPC_MESH = 6

+          The device is an OLPC mesh networking device.
+        
NM_DEVICE_TYPE_WIMAX = 7

+          The device is an 802.16e Mobile WiMAX device.
+        
NM_DEVICE_TYPE_MODEM = 8

+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
+        
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

+          The state change is normal.
+        
NM_DEVICE_STATE_REASON_NOW_MANAGED = 2

+          The device is now managed.
+        
NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3

+          The device is no longer managed.
+        
NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4

+          The device could not be readied for configuration.
+        
NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5

+          IP configuration could not be reserved (no available address, timeout, etc).
+        
NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6

+          The IP configuration is no longer valid.
+        
NM_DEVICE_STATE_REASON_NO_SECRETS = 7

+          Secrets were required, but not provided.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8

+          The 802.1X supplicant disconnected from the access point or authentication server.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9

+          Configuration of the 802.1X supplicant failed.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10

+          The 802.1X supplicant quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11

+          The 802.1X supplicant took too long to authenticate.
+        
NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12

+          The PPP service failed to start within the allowed time.
+        
NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13

+          The PPP service disconnected unexpectedly.
+        
NM_DEVICE_STATE_REASON_PPP_FAILED = 14

+          The PPP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15

+          The DHCP service failed to start within the allowed time.
+        
NM_DEVICE_STATE_REASON_DHCP_ERROR = 16

+          The DHCP service reported an unexpected error.
+        
NM_DEVICE_STATE_REASON_DHCP_FAILED = 17

+          The DHCP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18

+          The shared connection service failed to start.
+        
NM_DEVICE_STATE_REASON_SHARED_FAILED = 19

+          The shared connection service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20

+          The AutoIP service failed to start.
+        
NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21

+          The AutoIP service reported an unexpected error.
+        
NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22

+          The AutoIP service quit or failed unexpectedly.
+        
NM_DEVICE_STATE_REASON_MODEM_BUSY = 23

+          Dialing failed because the line was busy.
+        
NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24

+          Dialing failed because there was no dial tone.
+        
NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25

+          Dialing failed because there was carrier.
+        
NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26

+          Dialing timed out.
+        
NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27

+          Dialing failed.
+        
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28

+          Modem initialization failed.
+        
NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29

+          Failed to select the specified GSM APN.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30

+          Not searching for networks.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31

+          Network registration was denied.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32

+          Network registration timed out.
+        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33

+          Failed to register with the requested GSM network.
+        
NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34

+          PIN check failed.
+        
NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35

+          Necessary firmware for the device may be missing.
+        
NM_DEVICE_STATE_REASON_REMOVED = 36

+          The device was removed.
+        
NM_DEVICE_STATE_REASON_SLEEPING = 37

+          NetworkManager went to sleep.
+        
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38

+          The device's active connection was removed or disappeared.
+        
NM_DEVICE_STATE_REASON_USER_REQUESTED = 39

+          A user or client requested the disconnection.
+        
NM_DEVICE_STATE_REASON_CARRIER = 40

+          The device's carrier/link changed.
+        
NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41

+          The device's existing connection was assumed.
+        
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42

+          The 802.1x supplicant is now available.
+        
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43

+          The modem could not be found.
+        
NM_DEVICE_STATE_REASON_BT_FAILED = 44

+          The Bluetooth connection timed out or failed.
+        
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.

+
+  
org.freedesktop.NetworkManager.Device.Wired
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Active hardware address of the device.
+      
PermHwAddress -
+      s -
+      (read)

+        Permanent hardware address of the device.
+      
Speed -
+      u -
+      (read)

+        Design speed of the device, in megabits/second (Mb/s).
+      
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+      

+
+  
org.freedesktop.NetworkManager.Device.Wireless
Methods:
GetAccessPoints (
+        
+        ) →
+        ao

+        Get the list of access points visible to this device.
+      
Returns
access_points -
+      ao

+          List of access point object paths
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the wireless device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary containing the FIXME: check changed parameters.
+            
AccessPointAdded (
+        o: access_point
+        )

+            Emitted when a new access point is found by the device.
+        
Parameters
access_point -
+      o

+                The object path of the newly found access point.
+            
AccessPointRemoved (
+        o: access_point
+        )

+            Emitted when an access point disappears from view of the device.
+        
Parameters
access_point -
+      o

+                The object path of the access point that has disappeared.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        The active hardware address of the device.
+      
PermHwAddress -
+      s -
+      (read)

+        The permanent hardware address of the device.
+      
Mode -
+      u -
+      (read)
+      (NM_802_11_MODE)
+    

+        The operating mode of the wireless device.
+      
Bitrate -
+      u -
+      (read)

+        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
+      
ActiveAccessPoint -
+      o -
+      (read)

+        Object path of the access point currently used by the wireless device.
+      
WirelessCapabilities -
+      u -
+      (read)
+      (NM_802_11_DEVICE_CAP)
+    

+        The capabilities of the wireless device.
+      
Sets of flags:
NM_802_11_DEVICE_CAP

+        Flags describing the capabilities of a wireless device.
+      
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.

+
+  
org.freedesktop.NetworkManager.Device.Modem
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
ModemCapabilities -
+      u -
+      (read)
+      (NM_DEVICE_MODEM_CAPABILITIES)
+    

+        The generic family of access technologies the modem supports.  Not all
+        capabilities are available at the same time however; some modems require
+        a firmware reload or other reinitialization to switch between eg CDMA/EVDO
+        and GSM/UMTS.
+      
CurrentCapabilities -
+      u -
+      (read)
+      (NM_DEVICE_MODEM_CAPABILITIES)
+    

+        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+      
Sets of flags:
NM_DEVICE_MODEM_CAPABILITIES

+        Flags describing one or more of the general access technology families
+        that a modem device supports.
+      
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0
Modem has no capabilties.
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1

+          Modem supports the analog wired telephone network (ie 56k dialup) and
+          does not have wireless/cellular capabilities.
+        
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2

+          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
+          revision A, or EVDO revision B.
+        
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4

+          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
+          HSPA+ packet switched data capability.
+        
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8

+          Modem has at LTE data capability.
+        

+
+  
org.freedesktop.NetworkManager.Device.Bluetooth
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Bluetooth hardware address of the device.
+      
Name -
+      s -
+      (read)

+        Bluetooth name of the device.
+      
BtCapabilities -
+      u -
+      (read)
+      (NM_BT_CAPABILITIES)
+    

+        Bluetooth capabilities of the device (either DUN or NAP).
+      
Sets of flags:
NM_BT_CAPABILITIES

+        Flags describing the capabilities of a Bluetooth device.
+      
NM_BT_CAPABILITY_NONE = 0x0
The device has no recognized capabilities.
NM_BT_CAPABILITY_DUN = 0x1
The device supports Bluetooth Dial-Up Networking.
NM_BT_CAPABILITY_PAN = 0x2
The device supports Bluetooth Personal Area Networking.

+
+  
org.freedesktop.NetworkManager.Device.OlpcMesh
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the wireless device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary containing the FIXME: check changed parameters.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        The hardware address of the device.
+      
Companion -
+      o -
+      (read)

+        The object path of the companion device.
+      
ActiveChannel -
+      u -
+      (read)

+        The currently active channel.
+      

+
+  
org.freedesktop.NetworkManager.Device.WiMax
Methods:
GetNspList (
+        
+        ) →
+        ao

+        Get the list of NSPs visible to this device.
+      
Returns
nsps -
+      ao

+          List of NSP object paths
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )

+            Emitted when the WiMax device's properties changed.
+        
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values.
+            
NspAdded (
+        o: nsp
+        )

+            Emitted when a new NSP is found by the device.
+        
Parameters
nsp -
+      o

+                The object path of the newly found NSP.
+            
NspRemoved (
+        o: nsp
+        )

+            Emitted when an NSP disappears from view of the device.
+        
Parameters
nsp -
+      o

+                The object path of the NSP that has disappeared.
+            
Properties:
HwAddress -
+      s -
+      (read)

+        Hardware address of the device.
+      
CenterFrequency -
+      u -
+      (read)

+        Center frequency (in KHz) of the radio channel the device is using to
+        communicate with the network when connected.  Has no meaning when the
+        device is not connected.
+      
Rssi -
+      i -
+      (read)

+        RSSI of the current radio link in dBm.  This value indicates how strong
+        the raw received RF signal from the base station is, but does not
+        indicate the overall quality of the radio link.  Has no meaning when the
+        device is not connected.
+      
Cinr -
+      i -
+      (read)

+        CINR (Carrier to Interference + Noise Ratio) of the current radio link
+        in dB.  CINR is a more accurate measure of radio link quality.  Has no
+        meaning when the device is not connected.
+      
TxPower -
+      i -
+      (read)

+        Average power of the last burst transmitted by the device, in units of
+        0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+        -5.5 dBm.  Has no meaning when the device is not connected.
+      
Bsid -
+      s -
+      (read)

+        The ID of the serving base station as received from the network.  Has
+        no meaning when the device is not connected.
+      
ActiveNsp -
+      o -
+      (read)

+        Object path of the NSP currently used by the WiMax device.
+      

+
+  
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values.
+            
Properties:
Name -
+      s -
+      (read)
The name of the NSP.
SignalQuality -
+      u -
+      (read)
The current signal quality of the NSP, in percent.
NetworkType -
+      u -
+      (read)
+      (NM_WIMAX_NSP_NETWORK_TYPE)
+    
The network type of the NSP.
Sets of flags:
NM_WIMAX_NSP_NETWORK_TYPE

+        Network type of the NSP.
+      
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0
Unknown network.
NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1
Home network.
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2
Partner network.
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3
Roaming partner network.

+
+  
org.freedesktop.NetworkManager.IP4Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
+      aau -
+      (read)
Array of tuples of IPv4 address/prefix/gateway.  All 3
+      elements of each tuple are in network byte order.  Essentially:
+      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+      
Nameservers -
+      au -
+      (read)
The nameservers in use.
WinsServers -
+      au -
+      (read)
The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.
Domains -
+      as -
+      (read)
A list of domains this address belongs to.
Routes -
+      aau -
+      (read)
Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
+      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
+      addresses, while prefix and metric are simple unsigned integers.  Essentially:
+      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
+      

+
+  
org.freedesktop.NetworkManager.IP6Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
+      a(ayuay) -
+      (read)
Tuples of IPv6 address/prefix/gateway.
Nameservers -
+      aay -
+      (read)
The nameservers in use.
Domains -
+      as -
+      (read)
A list of domains this address belongs to.
Routes -
+      a(ayuayu) -
+      (read)
Tuples of IPv6 route/prefix/next-hop/metric.

+
+    
org.freedesktop.NetworkManager.DHCP4Config

+            Options and configuration returned by the IPv4 DHCP server.
+        
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                    A dictionary mapping property names to variant boxed values
+                
Properties:
Options -
+      a{sv} -
+      (read)
Configuration options returned by a DHCP server, if any.

+
+    
org.freedesktop.NetworkManager.DHCP6Config

+            Options and configuration returned by the IPv6 DHCP server.
+        
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                    A dictionary mapping property names to variant boxed values
+                
Properties:
Options -
+      a{sv} -
+      (read)
Configuration options returned by a DHCP server, if any.

+
+  
org.freedesktop.NetworkManager.Settings

+      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
+    
Methods:
ListConnections (
+        
+        ) →
+        ao

+        List the connections stored by this Settings object.
+      
Returns
connections -
+      ao

+          List of connections.
+        
GetConnectionByUuid (
+        s: uuid
+        ) →
+        o

+        Retrieve the object path of a connection, given that connection's UUID.
+      
Parameters
uuid -
+      s

+          The UUID to find the connection object path for.
+        
Returns
connection -
+      o

+          The connection's object path.
+        
AddConnection (
+        a{sa{sv}}: connection
+        ) →
+        o

+        Add new connection.
+      
Parameters
connection -
+      a{sa{sv}}

+          Connection settings and properties.
+        
Returns
path -
+      o

+          Object path of the new connection that was just added.
+        
SaveHostname (
+        s: hostname
+        ) →
+        nothing

+        Save the hostname to persistent configuration.
+      
Parameters
hostname -
+      s

+          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
+        
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
NewConnection (
+        o: connection
+        )

+        Emitted when a new connection has been added.
+      
Parameters
connection -
+      o

+          Object path of the new connection.
+        
Properties:
Hostname -
+      s -
+      (read)

+        The machine hostname stored in persistent configuration.
+      
CanModify -
+      b -
+      (read)

+        If true, adding and modifying connections is supported.
+      

+
+
+    
org.freedesktop.NetworkManager.Settings.Connection

+            Represents a single network connection configuration.
+        
Methods:
Update (
+        a{sa{sv}}: properties
+        ) →
+        nothing

+            Update the connection with new settings and properties, replacing
+            all previous settings and properties.  Secrets may be part of the
+            update request, and will be either stored in persistent storage or
+            given to a Secret Agent for storage, depending on the request.
+          
Parameters
properties -
+      a{sa{sv}}

+              New connection settings, properties, and (optionally) secrets.
+            
Delete (
+        
+        ) →
+        nothing

+            Delete the connection.
+          
GetSettings (
+        
+        ) →
+        a{sa{sv}}

+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                to the network, as those are often protected.  Secrets must
+                be requested separately using the GetSecrets() call.
+            
Returns
settings -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+                    The nested settings maps describing this object.
+                
GetSecrets (
+        s: setting_name
+        ) →
+        a{sa{sv}}

+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                the requestor's session will be returned.  The user will never
+                be prompted for secrets as a result of this request.
+            
Parameters
setting_name -
+      s

+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
+                
Returns
secrets -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+                    Nested settings maps containing secrets.
+                
Signals:
Updated (
+        
+        )

+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            
Removed (
+        
+        )

+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessable by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.
+            
Interface has no properties.

+
+
+  
org.freedesktop.NetworkManager.Connection.Active
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Connection -
+      o -
+      (read)
The path of the connection.
SpecificObject -
+      o -
+      (read)
A specific object associated with the active connection.
Uuid -
+      s -
+      (read)

+        The UUID of the connection, provided as a convenience so that clients
+        do not have to retrieve all connection details.
+      
Devices -
+      ao -
+      (read)
Array of object paths representing devices which are part of this active connection.
State -
+      u -
+      (read)
+      (NM_ACTIVE_CONNECTION_STATE)
+    
The state of this active connection.
Default -
+      b -
+      (read)
Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.
Default6 -
+      b -
+      (read)
Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.
Vpn -
+      b -
+      (read)
Whether this active connection is also a VPN connection.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

+          The active connection is in an unknown state.
+        
NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1

+          The connection is activating.
+        
NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2

+          The connection is activated.
+        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

+          The connection is being torn down and cleaned up.
+        

+
+  
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
+        s: identifier
+        ) →
+        nothing

+        Called by secret Agents to register their ability to provide and save
+        network secrets.
+      
Parameters
identifier -
+      s

+          Identifies this agent; only one agent in each user session may use the
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        
Unregister (
+        
+        ) →
+        nothing

+        Called by secret Agents to notify NetworkManager that they will no
+        longer handle requests for network secrets.  Agents are automatically
+        unregistered when they disconnect from D-Bus.
+      
Interface has no signals.
Interface has no properties.

+
+  
org.freedesktop.NetworkManager.VPN.Connection

+      Represents an active connection to a Virtual Private Network.
+    
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
VpnStateChanged (
+        u: state, u: reason
+        )

+        Emitted when the state of the VPN connection has changed.
+      
Parameters
state -
+      u
+      (NM_VPN_CONNECTION_STATE)
+    

+          The new state of the VPN connection.
+        
reason -
+      u
+      (NM_VPN_CONNECTION_STATE_REASON)
+    

+          Reason code describing the change to the new state.
+        
Properties:
VpnState -
+      u -
+      (read)
+      (NM_VPN_CONNECTION_STATE)
+    
The VPN-specific state of the connection.
Banner -
+      s -
+      (read)
The banner string of the VPN connection.
Enumerated types:
NM_VPN_CONNECTION_STATE
NM_VPN_CONNECTION_STATE_UNKNOWN = 0

+          The state of the VPN connection is unknown.
+        
NM_VPN_CONNECTION_STATE_PREPARE = 1

+          The VPN connection is preparing to connect.
+        
NM_VPN_CONNECTION_STATE_NEED_AUTH = 2

+          The VPN connection needs authorization credentials.
+        
NM_VPN_CONNECTION_STATE_CONNECT = 3

+          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
+        
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4

+          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
+        
NM_VPN_CONNECTION_STATE_ACTIVATED = 5

+          The VPN connection is active.
+        
NM_VPN_CONNECTION_STATE_FAILED = 6

+          The VPN connection failed.
+        
NM_VPN_CONNECTION_STATE_DISCONNECTED = 7

+          The VPN connection is disconnected.
+        
NM_VPN_CONNECTION_STATE_REASON
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0

+          The reason for the VPN connection state change is unknown.
+        
NM_VPN_CONNECTION_STATE_REASON_NONE = 1

+          No reason was given for the VPN connection state change.
+        
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2

+          The VPN connection changed state because the user disconnected it.
+        
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3

+          The VPN connection changed state because the device it was using was disconnected.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4

+          The service providing the VPN connection was stopped.
+        
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5

+          The IP config of the VPN connection was invalid.
+        
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6

+          The connection attempt to the VPN service timed out.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7

+          A timeout occurred while starting the service providing the VPN connection.
+        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8

+          Starting the service starting the service providing the VPN connection failed.
+        
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9

+          Necessary secrets for the VPN connection were not provided.
+        
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10

+          Authentication to the VPN server failed.
+        
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11

+          The connection was deleted from settings.
+        

+
+  
org.freedesktop.NetworkManager.VPN.Plugin

+      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
+    
Methods:
Connect (
+        a{sa{sv}}: connection
+        ) →
+        nothing

+        Tells the plugin to connect.
+      
Parameters
connection -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+          Describes the connection to be established.
+        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.(generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.(generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.(generic description)
NeedSecrets (
+        a{sa{sv}}: settings
+        ) →
+        s

+        Asks the plugin whether the provided connection will require secrets to connect successfully.
+      
Parameters
settings -
+      a{sa{sv}}
+      (String_String_Variant_Map_Map)
+    

+          Describes the connection that may need secrets.
+        
Returns
setting_name -
+      s

+          The setting name within the provided connection that requires secrets, if any.
+        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.(generic description)
Disconnect (
+        
+        ) →
+        nothing

+        Disconnect the plugin.
+      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetIp4Config (
+        a{sv}: config
+        ) →
+        nothing

+        Set IPv4 details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Ip4Config details for the conneciton.
+        
SetFailure (
+        s: reason
+        ) →
+        nothing

+        Indicate a failure to the plugin.
+      
Parameters
reason -
+      s

+          The reason for the failure.
+        
Signals:
StateChanged (
+        u: state
+        )

+        Emitted when the plugin state changes.
+      
Parameters
state -
+      u
+      (NM_VPN_CONNECTION_STATE)
+    

+          The new state of the plugin.
+        
Ip4Config (
+        a{sv}: ip4config
+        )

+        The plugin obtained an IPv4 configuration.
+      
Parameters
ip4config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The IPv4 configuration.
+        
LoginBanner (
+        s: banner
+        )

+        Emitted when the plugin receives a login banner from the VPN service.
+      
Parameters
banner -
+      s

+          The login banner string.
+        
Failure (
+        u: reason
+        )

+        Emitted when a failure in the VPN plugin occurs.
+      
Parameters
reason -
+      u
+      (NM_VPN_PLUGIN_FAILURE)
+    

+          Reason code for the failure.
+        
Properties:
State -
+      u -
+      (read)
+      (NM_VPN_CONNECTION_STATE)
+    

+        The state of the plugin.
+      
Enumerated types:
NM_VPN_PLUGIN_FAILURE
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0

+          Login failed.
+        
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1

+          Connect failed.
+        
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

+          Invalid IP configuration returned from the VPN plugin.
+        

+
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
+        s: Key → v: Value
+        }
+      
A mapping from strings to variants representing extra
+      key-value pairs.
Members
Key -
+      s
(undocumented)
Value -
+      v
(undocumented)
String_String_Map - a{
+        s: Key → s: Value
+        }
+      
A mapping from strings to strings representing extra
+      key-value pairs.
Members
Key -
+      s
(undocumented)
Value -
+      s
(undocumented)
String_String_Variant_Map_Map - a{
+        s: Key → a{sv}: Value
+        }
+      
A mapping from strings to a map of string to variant.
Members
Key -
+      s
(undocumented)
Value -
+      a{sv}
+      (String_Variant_Map)
+    
(undocumented)
Errors:

+  
+
+  
org.freedesktop.NetworkManager.Error.UnknownConnection

+        Connection was not provided by the settings service.
+    
+
+  
org.freedesktop.NetworkManager.Error.UnknownDevice

+        Unknown device.
+    
+
+  
org.freedesktop.NetworkManager.Error.PermissionDenied

+    User does not have the permission to activate this connection.
+    
+
+
Errors:

+  
org.freedesktop.NetworkManager.VPN.Error.General
This is a drab, nondescript error.
+  
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.
+  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.
+  
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.
+  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.
+  
org.freedesktop.NetworkManager.VPN.Error.WrongState
The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general?
+  
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.
+  
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
+  
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
+
Index
Index of interfaces
Index of types

diff --git a/docs/api/version.xml b/docs/api/version.xml
new file mode 100644
index 00000000..b81eb02c
--- /dev/null
+++ b/docs/api/version.xml
@@ -0,0 +1 @@
+0.8.999
diff --git a/docs/api/version.xml.in b/docs/api/version.xml.in
new file mode 100644
index 00000000..d78bda93
--- /dev/null
+++ b/docs/api/version.xml.in
@@ -0,0 +1 @@
+@VERSION@
diff --git a/docs/generate-settings-spec.c b/docs/generate-settings-spec.c
deleted file mode 100644
index 6ec8f7c5..00000000
--- a/docs/generate-settings-spec.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * Dan Williams 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser 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.
- *
- * (C) Copyright 2009 - 2010 Red Hat, Inc.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include "config.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-typedef NMSetting* (*SettingNewFunc) (void);
-
-static SettingNewFunc funcs[] = {
-	nm_setting_802_1x_new,
-	nm_setting_bluetooth_new,
-	nm_setting_cdma_new,
-	nm_setting_connection_new,
-	nm_setting_gsm_new,
-	nm_setting_ip4_config_new,
-	nm_setting_ip6_config_new,
-	nm_setting_olpc_mesh_new,
-	nm_setting_ppp_new,
-	nm_setting_pppoe_new,
-	nm_setting_serial_new,
-	nm_setting_vpn_new,
-	nm_setting_wired_new,
-	nm_setting_wireless_new,
-	nm_setting_wireless_security_new,
-	NULL
-};
-
-typedef struct {
-	const char *gvalue_name;
-	const char *new_name;
-} TypeNameElement;
-
-static TypeNameElement name_map[] = {
-	{ "gchararray", "string" },
-	{ "GSList_gchararray_", "array of string" },
-	{ "GArray_guchar_", "byte array" },
-	{ "gboolean", "boolean" },
-	{ "guint64", "uint64" },
-	{ "gint", "int32" },
-	{ "guint", "uint32" },
-	{ "GArray_guint_", "array of uint32" },
-	{ "GPtrArray_GArray_guint__", "array of array of uint32" },
-	{ "GPtrArray_GArray_guchar__", "array of byte array" },
-	{ "GHashTable_gchararray+gchararray_", "dict of (string::string)" },
-	{ "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___", "array of (byte array, uint32, byte array)" },
-	{ "GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__", "array of (byte array, uint32, byte array, uint32)" },
-	{ NULL, NULL }
-};
-
-static void
-write_one_setting (FILE *f, SettingNewFunc func)
-{
-	int w;
-	NMSetting *s;
-	GParamSpec **props, **iter;
-	guint num;
-
-	s = func ();
-
-	/* write out section header */
-	w = fprintf (f, "
Setting name: '%s'
\n", nm_setting_get_name (s));
-
-	w = fprintf (f, "\n");
-	w = fprintf (f, "\n");
-	w = fprintf (f, "\n");
-	w = fprintf (f, "\n");
-	w = fprintf (f, "\n");
-	props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (s)), &num);
-	for (iter = props; iter && *iter; iter++) {
-		const char *key_name, *value_type, *value_desc;
-		char *default_value;
-		TypeNameElement *name_iter;
-		GValue value = { 0, };
-
-		value_type = g_type_name (G_PARAM_SPEC_VALUE_TYPE (*iter));
-		for (name_iter = &name_map[0]; name_iter && name_iter->gvalue_name; name_iter++) {
-			if (!strcmp (value_type, name_iter->gvalue_name)) {
-				value_type = name_iter->new_name;
-				break;
-			}
-		}
-
-		key_name = g_param_spec_get_name (*iter);
-		value_desc = g_param_spec_get_blurb (*iter);
-
-		g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (*iter));
-		g_param_value_set_default (*iter, &value);
-		default_value = g_strdup_value_contents (&value);
-		if (default_value && !strcmp (default_value, "NULL")) {
-			g_free (default_value);
-			default_value = NULL;
-		}
-
-		if (!strcmp (key_name, NM_SETTING_NAME)) {
-			g_free (default_value);
-			default_value = NULL;
-			g_object_get (G_OBJECT (s), NM_SETTING_NAME, &default_value, NULL);
-		}
-
-		w = fprintf (f, "\n");
-		w = fprintf (f, "\n", key_name);
-		w = fprintf (f, "\n", value_type);
-		w = fprintf (f, "\n", default_value ? default_value : "");
-		w = fprintf (f, "\n", value_desc);
-		w = fprintf (f, "\n");
-
-		g_free (default_value);
-	}
-
-	w = fprintf (f, "
Key NameValue TypeDefault ValueValue Description
%s%s%s%s

\n");
-	g_object_unref (s);
-}
-
-int
-main (int argc, char *argv[])
-{
-	GError *error = NULL;
-	FILE *f;
-	int w;
-	SettingNewFunc *fptr;
-
-	if (argc != 2) {
-		fprintf (stderr, "Usage: %s \n", argv[0]);
-		_exit (1);
-	}
-
-	g_type_init ();
-
-	if (!nm_utils_init (&error)) {
-		fprintf (stderr, "ERR: failed to initialize libnm-util: %s", error->message);
-		_exit (2);
-	}
-
-	f = fopen (argv[1], "w");
-	if (!f) {
-		fprintf (stderr, "ERR: could not create %s: %d\n", argv[1], errno);
-		_exit (3);
-	}
-
-	w = fprintf (f, "\n\n");
-	w = fprintf (f, "NetworkManager " PACKAGE_VERSION " Settings Specification");
-	w = fprintf (f, "\n\n");
-
-	for (fptr = funcs; fptr && *fptr; fptr++)
-		write_one_setting (f, *fptr);
-
-	w = fprintf (f, "\n\n");
-
-	fclose (f);
-	_exit (0);
-}
-
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index 4a3a6e1e..7dfea79a 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE=libnm-glib
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
@@ -43,20 +43,22 @@ IGNORE_HFILES= \
 	nm-device-bt-bindings.h \
 	nm-device-ethernet-bindings.h \
 	nm-device-wifi-bindings.h \
+	nm-device-modem-bindings.h \
+	nm-device-wimax-bindings.h \
 	nm-dhcp4-config-bindings.h \
 	nm-dhcp6-config-bindings.h \
-	nm-exported-connection-bindings.h \
-	nm-exported-connection-glue.h \
+	nm-settings-connection-glue.h \
 	nm-ip4-config-bindings.h \
 	nm-ip6-config-bindings.h \
 	nm-settings-bindings.h \
 	nm-settings-glue.h \
-	nm-settings-system-bindings.h \
+	nm-settings-connection-bindings.h \
+	nm-secret-agent-bindings.h \
 	nm-vpn-connection-bindings.h \
 	nm-vpn-plugin-glue.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = 
+HTML_IMAGES = libnm-glib.png
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files = 
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 639a4494..775d33be 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -44,11 +44,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = docs/libnm-glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,7 +70,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -74,13 +78,15 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 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@
@@ -92,6 +98,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -100,6 +107,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -108,8 +116,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -124,13 +132,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -138,6 +156,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -146,13 +166,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -178,13 +200,12 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
@@ -198,11 +219,15 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 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@
@@ -256,7 +281,7 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE = libnm-glib
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
@@ -294,21 +319,23 @@ IGNORE_HFILES = \
 	nm-device-bt-bindings.h \
 	nm-device-ethernet-bindings.h \
 	nm-device-wifi-bindings.h \
+	nm-device-modem-bindings.h \
+	nm-device-wimax-bindings.h \
 	nm-dhcp4-config-bindings.h \
 	nm-dhcp6-config-bindings.h \
-	nm-exported-connection-bindings.h \
-	nm-exported-connection-glue.h \
+	nm-settings-connection-glue.h \
 	nm-ip4-config-bindings.h \
 	nm-ip6-config-bindings.h \
 	nm-settings-bindings.h \
 	nm-settings-glue.h \
-	nm-settings-system-bindings.h \
+	nm-settings-connection-bindings.h \
+	nm-secret-agent-bindings.h \
 	nm-vpn-connection-bindings.h \
 	nm-vpn-plugin-glue.h
 
 
 # Images to copy into HTML directory.
-HTML_IMAGES = 
+HTML_IMAGES = libnm-glib.png
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files = 
@@ -344,17 +371,18 @@ GTKDOC_LIBS = \
 #
 GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = \
+	$(SETUP_FILES)
+
+DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -576,20 +604,38 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+setup.stamp: setup-build.stamp
+	@true
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
@@ -601,10 +647,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -618,11 +668,11 @@ $(srcdir)/tmpl/*.sgml:
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -632,26 +682,32 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -662,7 +718,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -672,12 +728,15 @@ clean-local:
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -722,11 +781,11 @@ uninstall-local:
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index e26a0515..08cf78e8 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -5,17 +5,17 @@
 NMAccessPoint
 
 
-
-
+
+
 
-
+
 
 
 
 
-
-
+
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,33 +39,40 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_ACCESS_POINT_FLAGS
 #define             NM_ACCESS_POINT_WPA_FLAGS
 #define             NM_ACCESS_POINT_RSN_FLAGS
 #define             NM_ACCESS_POINT_SSID
+#define             NM_ACCESS_POINT_BSSID
 #define             NM_ACCESS_POINT_FREQUENCY
-#define             NM_ACCESS_POINT_HW_ADDRESS
 #define             NM_ACCESS_POINT_MODE
 #define             NM_ACCESS_POINT_MAX_BITRATE
 #define             NM_ACCESS_POINT_STRENGTH
+#define             NM_ACCESS_POINT_HW_ADDRESS
                     NMAccessPoint;
                     NMAccessPointClass;
 GObject *           nm_access_point_new                 (DBusGConnection *connection,
                                                          const char *path);
-guint32             nm_access_point_get_flags           (NMAccessPoint *ap);
-guint32             nm_access_point_get_wpa_flags       (NMAccessPoint *ap);
-guint32             nm_access_point_get_rsn_flags       (NMAccessPoint *ap);
-const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);
+NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
+NM80211ApSecurityFlags  nm_access_point_get_wpa_flags   (NMAccessPoint *ap);
+NM80211ApSecurityFlags  nm_access_point_get_rsn_flags   (NMAccessPoint *ap);
+const GByteArray *      nm_access_point_get_ssid        (NMAccessPoint *ap);
+const char *            nm_access_point_get_bssid       (NMAccessPoint *ap);
 guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);
-const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);
 NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);
 guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);
 guint8              nm_access_point_get_strength        (NMAccessPoint *ap);
+GSList *                nm_access_point_filter_connections
+                                                        (NMAccessPoint *ap,
+                                                         const GSList *connections);
+gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
+                                                         NMConnection *connection);
+const char *            nm_access_point_get_hw_address  (NMAccessPoint *ap);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -73,28 +80,29 @@ const char *        
+

 
Properties

 
+  "bssid"                    gchar*                : Read
   "flags"                    guint                 : Read
   "frequency"                guint                 : Read
   "hw-address"               gchar*                : Read
   "max-bitrate"              guint                 : Read
   "mode"                     guint                 : Read
   "rsn-flags"                guint                 : Read
-  "ssid"                     nm-ssid*              : Read
+  "ssid"                     NMSsid*               : Read
   "strength"                 guchar                : Read
   "wpa-flags"                guint                 : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_ACCESS_POINT_FLAGS

 
#define NM_ACCESS_POINT_FLAGS       "flags"
 

@@ -102,7 +110,7 @@ const char *        
+

 
NM_ACCESS_POINT_WPA_FLAGS

 
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 

@@ -110,7 +118,7 @@ const char *        
+

 
NM_ACCESS_POINT_RSN_FLAGS

 
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 

@@ -118,7 +126,7 @@ const char *        
+

 
NM_ACCESS_POINT_SSID

 
#define NM_ACCESS_POINT_SSID        "ssid"
 

@@ -126,23 +134,23 @@ const char *        
-
NM_ACCESS_POINT_FREQUENCY

-
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
+

+
NM_ACCESS_POINT_BSSID

+
#define NM_ACCESS_POINT_BSSID       "bssid"
 

 

 

 

 

-

-
NM_ACCESS_POINT_HW_ADDRESS

-
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+

+
NM_ACCESS_POINT_FREQUENCY

+
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 

 

 

 

 

-

+

 
NM_ACCESS_POINT_MODE

 
#define NM_ACCESS_POINT_MODE        "mode"
 

@@ -150,7 +158,7 @@ const char *        
+

 
NM_ACCESS_POINT_MAX_BITRATE

 
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

@@ -158,7 +166,7 @@ const char *        
+

 
NM_ACCESS_POINT_STRENGTH

 
#define NM_ACCESS_POINT_STRENGTH    "strength"
 

@@ -166,14 +174,22 @@ const char *        
+

+
NM_ACCESS_POINT_HW_ADDRESS

+
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+

+

+

+

+

+

 
NMAccessPoint

 
typedef struct _NMAccessPoint NMAccessPoint;

 

 

 

 

-

+

 
NMAccessPointClass

 
typedef struct {
 	NMObjectClass parent;
@@ -191,7 +207,7 @@ const char *        
+

 
nm_access_point_new ()

 
GObject *           nm_access_point_new                 (DBusGConnection *connection,
                                                          const char *path);

@@ -208,23 +224,22 @@ Creates a new 
 
 
path :

-the DBusobject path of the access point
-
+the DBusobject path of the access point
 
 
 
Returns :

- a new access point
+a new access point. [transfer full]
 
 
 
 

 

 

-

+

 
nm_access_point_get_flags ()

-
guint32             nm_access_point_get_flags           (NMAccessPoint *ap);

+
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

 

-Gets the flags of the access point
+Gets the flags of the access point.
 

 
@@ -236,18 +251,17 @@ Gets the flags of the access point
 
-
+

 

 

 
Returns :
 the flags
-the flags
 

 
 

 

 

-

+

 
nm_access_point_get_wpa_flags ()

-
guint32             nm_access_point_get_wpa_flags       (NMAccessPoint *ap);

+
NM80211ApSecurityFlags  nm_access_point_get_wpa_flags   (NMAccessPoint *ap);

 

-Gets the WPA flags of the access point.
+Gets the WPA (version 1) flags of the access point.
 

 
@@ -259,18 +273,18 @@ Gets the WPA flags of the access point.
 
-
+

 

 

 
Returns :
 the WPA flags
-the WPA flags
 

 
 

 

 

-

+

 
nm_access_point_get_rsn_flags ()

-
guint32             nm_access_point_get_rsn_flags       (NMAccessPoint *ap);

+
NM80211ApSecurityFlags  nm_access_point_get_rsn_flags   (NMAccessPoint *ap);

 

-Gets the RSN flags of the access point.
+Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
+point.
 

 
@@ -282,16 +296,15 @@ Gets the RSN flags of the access point.
 
-
+

 

 

 
Returns :
 the RSN flags
-the RSN flags
 

 
 

 

 

-

+

 
nm_access_point_get_ssid ()

-
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

+
const GByteArray *      nm_access_point_get_ssid        (NMAccessPoint *ap);

 

 Gets the SSID of the access point.
 

@@ -305,19 +318,18 @@ Gets the SSID of the access point.
 
 
 
Returns :

- the GByteArray containing the SSID. This is the internal copy used by the
-access point, and must not be modified.
-
+the GByteArray containing the SSID. This is the internal copy used by the
+access point, and must not be modified.
 
 
 

 

 

-

-
nm_access_point_get_frequency ()

-
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

+

+
nm_access_point_get_bssid ()

+
const char *            nm_access_point_get_bssid       (NMAccessPoint *ap);

 

-Gets the frequency of the access point.
+Gets the Basic Service Set ID (BSSID) of the WiFi access point.
 

 
@@ -329,18 +341,18 @@ Gets the frequency of the access point.
 
-
+

 

 

 
Returns :
 the frequency
-the BSSID of the access point. This is an internal string and must
+not be modified or freed.
 

 
 

 

 

-

-
nm_access_point_get_hw_address ()

-
const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);

+

+
nm_access_point_get_frequency ()

+
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

 

-Gets the hardware (MAC) address of the access point.
+Gets the frequency of the access point.
 

 
@@ -352,15 +364,13 @@ Gets the hardware (MAC) address of the access point.
 
-
+

 

 

 
Returns :
 the hardware address of the access point. This is the internal string used by the
-access point and must not be modified.
-the frequency
 

 
 

 

 

-

+

 
nm_access_point_get_mode ()

 
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);

 

@@ -376,14 +386,13 @@ Gets the mode of the access point.
 
 
 
Returns :

- the mode
-
+the mode
 
 
 

 

 

-

+

 
nm_access_point_get_max_bitrate ()

 
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

 

@@ -399,14 +408,13 @@ Gets the maximum bit rate of the access point.
 
 
 
Returns :

- the maximum bit rate
-
+the maximum bit rate
 
 
 

 

 

-

+

 
nm_access_point_get_strength ()

 
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);

 

@@ -422,16 +430,96 @@ Gets the current signal strength of the access point.
 
 
 
Returns :

- the signal strength
+the signal strength
+
+
+

+

+

+

+
nm_access_point_filter_connections ()

+
GSList *                nm_access_point_filter_connections
+                                                        (NMAccessPoint *ap,
+                                                         const GSList *connections);

+

+Filters a given list of connections for a given NMAccessPoint object and
+return connections which may be activated with the access point.  Any
+returned connections will match the ap's SSID and (if given) BSSID and
+other attributes like security settings, channel, etc.
+

+

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


ap :
an NMAccessPoint to filter connections for
connections :
a list of
+NMConnection objects to filter. [element-type NetworkManager.Connection]
+
Returns :
a
+list of NMConnection objects that could be activated with the given ap.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
 
 

 
 

 

+

+

+
nm_access_point_connection_valid ()

+
gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
+                                                         NMConnection *connection);

+

+

+

+

+

+
nm_access_point_get_hw_address ()

+
const char *            nm_access_point_get_hw_address  (NMAccessPoint *ap);

+

+
Warning

+
nm_access_point_get_hw_address has been deprecated since version 0.9 and should not be used in newly-written code. Use nm_access_point_get_bssid() instead.

 

-

+

+Gets the hardware (MAC) address of the access point.
+

+

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


ap :
a NMAccessPoint
+
Returns :
the hardware address of the access point. This is the internal string used by the
+access point and must not be modified.

+

+

+

 
Property Details

-

+

+
The "bssid" property

+
  "bssid"                    gchar*                : Read

+

+The BSSID of the access point.
+

+
Default value: NULL

+

+

+

 
The "flags" property

 
  "flags"                    guint                 : Read

 

@@ -441,7 +529,7 @@ The flags of the access point.
 
Default value: 0

 

 

-

+

 
The "frequency" property

 
  "frequency"                guint                 : Read

 

@@ -451,7 +539,7 @@ The frequency of the access point.
 
Default value: 0

 

 

-

+

 
The "hw-address" property

 
  "hw-address"               gchar*                : Read

 

@@ -460,7 +548,7 @@ The hardware address of the access point.
 
Default value: NULL

 

 

-

+

 
The "max-bitrate" property

 
  "max-bitrate"              guint                 : Read

 

@@ -469,7 +557,7 @@ The maximum bit rate of the access point.
 
Default value: 0

 

 

-

+

 
The "mode" property

 
  "mode"                     guint                 : Read

 

@@ -479,7 +567,7 @@ The mode of the access point.
 
Default value: 2

 

 

-

+

 
The "rsn-flags" property

 
  "rsn-flags"                guint                 : Read

 

@@ -488,15 +576,15 @@ The RSN flags of the access point.
 
Default value: 0

 

 

-

+

 
The "ssid" property

-
  "ssid"                     nm-ssid*              : Read

+
  "ssid"                     NMSsid*               : Read

 

 The SSID of the access point.
 

 

 

-

+

 
The "strength" property

 
  "strength"                 guchar                : Read

 

@@ -505,7 +593,7 @@ The current signal strength of the access point.
 
Default value: 0

 

 

-

+

 
The "wpa-flags" property

 
  "wpa-flags"                guint                 : Read

 

@@ -517,6 +605,6 @@ The WPA flags of the access point.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 5aa96a21..7f597bfe 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -5,17 +5,17 @@
 NMActiveConnection
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_ACTIVE_CONNECTION_SERVICE_NAME
-#define             NM_ACTIVE_CONNECTION_CONNECTION
+
#define             NM_ACTIVE_CONNECTION_CONNECTION
+#define             NM_ACTIVE_CONNECTION_UUID
 #define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
 #define             NM_ACTIVE_CONNECTION_DEVICES
 #define             NM_ACTIVE_CONNECTION_STATE
@@ -52,10 +52,8 @@
                     NMActiveConnectionClass;
 GObject *           nm_active_connection_new            (DBusGConnection *connection,
                                                          const char *path);
-const char *        nm_active_connection_get_service_name
-                                                        (NMActiveConnection *connection);
-NMConnectionScope   nm_active_connection_get_scope      (NMActiveConnection *connection);
 const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
+const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
 const char *        nm_active_connection_get_specific_object
                                                         (NMActiveConnection *connection);
 const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
@@ -64,7 +62,7 @@ const gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -73,42 +71,41 @@ const NMVPNConnection
 

 

-

+

 
Properties

 
   "connection"               gchar*                : Read
   "default"                  gboolean              : Read
   "default6"                 gboolean              : Read
-  "devices"                  nm-object-array*      : Read
-  "service-name"             gchar*                : Read
+  "devices"                  NMObjectArray*        : Read
   "specific-object"          gchar*                : Read
   "state"                    guint                 : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

-
NM_ACTIVE_CONNECTION_SERVICE_NAME

-
#define NM_ACTIVE_CONNECTION_SERVICE_NAME        "service-name"
+

+
NM_ACTIVE_CONNECTION_CONNECTION

+
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
 

 

 

 

 

-

-
NM_ACTIVE_CONNECTION_CONNECTION

-
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+

+
NM_ACTIVE_CONNECTION_UUID

+
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
 

 

 

 

 

-

+

 
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

 
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 

@@ -116,7 +113,7 @@ const 
+

 
NM_ACTIVE_CONNECTION_DEVICES

 
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 

@@ -124,7 +121,7 @@ const 
+

 
NM_ACTIVE_CONNECTION_STATE

 
#define NM_ACTIVE_CONNECTION_STATE               "state"
 

@@ -132,7 +129,7 @@ const 
+

 
NM_ACTIVE_CONNECTION_DEFAULT

 
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 

@@ -140,7 +137,7 @@ const 
+

 
NM_ACTIVE_CONNECTION_DEFAULT6

 
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 

@@ -148,14 +145,14 @@ const 
+

 
NMActiveConnection

 
typedef struct _NMActiveConnection NMActiveConnection;

 

 

 

 

-

+

 
NMActiveConnectionClass

 
typedef struct {
 	NMObjectClass parent;
@@ -173,7 +170,7 @@ const 
+

 
nm_active_connection_new ()

 
GObject *           nm_active_connection_new            (DBusGConnection *connection,
                                                          const char *path);

@@ -190,48 +187,22 @@ Creates a new path :

-the DBus object path of the device
-
-
-
-
Returns :

- a new active connection
-
-
-
-

-

-

-

-
nm_active_connection_get_service_name ()

-
const char *        nm_active_connection_get_service_name
-                                                        (NMActiveConnection *connection);

-

-Gets the service name of the active connection.
-

-

--
-
-
-
+
-


connection :
a NMActiveConnection
-the DBus object path of the device
 

 

 
Returns :
 the service name. This is the internal string used by the
-connection, and must not be modified.
+a new active connection. [transfer full]
 
 

 
 

 

 

-

-
nm_active_connection_get_scope ()

-
NMConnectionScope   nm_active_connection_get_scope      (NMActiveConnection *connection);

+

+
nm_active_connection_get_connection ()

+
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

 

-Gets the scope of the active connection.
+Gets the NMConnection's DBus object path.
 

 
@@ -243,18 +214,18 @@ Gets the scope of the active connection.
 
-
+

 

 

 
Returns :
 the connection's scope
-the object path of the NMConnection inside of NMActiveConnection.
+This is the internal string used by the connection, and must not be modified.
 

 
 

 

 

-

-
nm_active_connection_get_connection ()

-
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

+

+
nm_active_connection_get_uuid ()

+
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

 

-Gets the NMConnection's DBus object path.
+Gets the NMConnection's UUID.
 

 
@@ -266,15 +237,14 @@ Gets the Returns :

-
+

 

 the object path of the NMConnection inside of NMActiveConnection.
-This is the internal string used by the connection, and must not be modified.
-the UUID of the NMConnection that backs the NMActiveConnection.
+This is the internal string used by the connection, and must not be modified.
 

 
 

 

 

-

+

 
nm_active_connection_get_specific_object ()

 
const char *        nm_active_connection_get_specific_object
                                                         (NMActiveConnection *connection);

@@ -291,15 +261,14 @@ Gets the "specific object" used at the activation.
 
 
 
Returns :

- the specific object's DBus path. This is the internal string used by the
-connection, and must not be modified.
-
+the specific object's DBus path. This is the internal string used by the
+connection, and must not be modified.
 
 
 

 

 

-

+

 
nm_active_connection_get_devices ()

 
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

 

@@ -315,15 +284,15 @@ Gets the Returns :

- the GPtrArray containing NMDevices.
-This is the internal copy used by the connection, and must not be modified.
+the GPtrArray containing NMDevices.
+This is the internal copy used by the connection, and must not be modified. [element-type NMClient.Device]
 
 
 
 

 

 

-

+

 
nm_active_connection_get_state ()

 
NMActiveConnectionState  nm_active_connection_get_state (NMActiveConnection *connection);

 

@@ -339,14 +308,13 @@ Gets the active connection's state.
 
 
 
Returns :

- the state
-
+the state
 
 
 

 

 

-

+

 
nm_active_connection_get_default ()

 
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

 

@@ -363,14 +331,14 @@ the default IPv4 route and DNS information).
 
 
 
Returns :

- TRUE if the active connection is the default IPv4 connection
-
+
+TRUE if the active connection is the default IPv4 connection
 
 
 

 

 

-

+

 
nm_active_connection_get_default6 ()

 
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

 

@@ -387,16 +355,16 @@ the default IPv6 route and DNS information).
 
 
 
Returns :

- TRUE if the active connection is the default IPv6 connection
-
+
+TRUE if the active connection is the default IPv6 connection
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "connection" property

 
  "connection"               gchar*                : Read

 

@@ -405,7 +373,7 @@ The connection's path of the active connection.
 
Default value: NULL

 

 

-

+

 
The "default" property

 
  "default"                  gboolean              : Read

 

@@ -414,7 +382,7 @@ Whether the active connection is the default IPv4 one.
 
Default value: FALSE

 

 

-

+

 
The "default6" property

 
  "default6"                 gboolean              : Read

 

@@ -423,22 +391,13 @@ Whether the active connection is the default IPv6 one.
 
Default value: FALSE

 

 

-

+

 
The "devices" property

-
  "devices"                  nm-object-array*      : Read

+
  "devices"                  NMObjectArray*        : Read

 
Devices.

 

 

-

-
The "service-name" property

-
  "service-name"             gchar*                : Read

-

-The service name of the active connection.
-

-
Default value: NULL

-

-

-

+

 
The "specific-object" property

 
  "specific-object"          gchar*                : Read

 

@@ -447,19 +406,19 @@ The specific object's path of the active connection.
 
Default value: NULL

 

 

-

+

 
The "state" property

 
  "state"                    guint                 : Read

 

 The state of the active connection.
 

-
Allowed values: <= 2

+
Allowed values: <= 3

 
Default value: 0

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMCdmaDevice.html b/docs/libnm-glib/html/NMCdmaDevice.html
deleted file mode 100644
index c96dc1bc..00000000
--- a/docs/libnm-glib/html/NMCdmaDevice.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-NMCdmaDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMCdmaDevice

-
NMCdmaDevice

-

-

-
Synopsis

-
                    NMCdmaDevice;
-                    NMCdmaDeviceClass;
-GObject *           nm_cdma_device_new                  (DBusGConnection *connection,
-                                                         const char *path);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMSerialDevice
-                     +----NMCdmaDevice
-

-

-

-
Description

-

-

-

-

-
Details

-

-
NMCdmaDevice

-
typedef struct _NMCdmaDevice NMCdmaDevice;

-

-

-

-

-

-
NMCdmaDeviceClass

-
typedef struct {
-	NMSerialDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMCdmaDeviceClass;
-

-

-

-

-

-

-
nm_cdma_device_new ()

-
GObject *           nm_cdma_device_new                  (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMCdmaDevice.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the DBusGConnection
-
path :
the DBus object path of the device
-
Returns :
 a new device
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index e9087cf0..b8834f84 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -5,17 +5,17 @@
 NMClient
 
 
-
-
+
+
 
-
+
 
 
 
 
-
-
+
+
@@ -32,7 +32,7 @@
                   Signals
-

+

 

 

 
@@ -41,15 +41,18 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_CLIENT_STATE
+
#define             NM_CLIENT_VERSION
+#define             NM_CLIENT_STATE
 #define             NM_CLIENT_MANAGER_RUNNING
 #define             NM_CLIENT_NETWORKING_ENABLED
 #define             NM_CLIENT_WIRELESS_ENABLED
 #define             NM_CLIENT_WIRELESS_HARDWARE_ENABLED
 #define             NM_CLIENT_WWAN_ENABLED
 #define             NM_CLIENT_WWAN_HARDWARE_ENABLED
+#define             NM_CLIENT_WIMAX_ENABLED
+#define             NM_CLIENT_WIMAX_HARDWARE_ENABLED
 #define             NM_CLIENT_ACTIVE_CONNECTIONS
 enum                NMClientPermission;
 enum                NMClientPermissionResult;
@@ -59,15 +62,27 @@ enum                GPtrArray *   nm_client_get_devices               (NMClient *client);
 NMDevice *          nm_client_get_device_by_path        (NMClient *client,
                                                          const char *object_path);
-void                (*NMClientActivateDeviceFn)         (gpointer user_data,
-                                                         const char *object_path,
-                                                         GError *error);
+void                (*NMClientActivateFn)               (NMClient *client,
+                                                         NMActiveConnection *active_connection,
+                                                         GError *error,
+                                                         gpointer user_data);
 void                nm_client_activate_connection       (NMClient *client,
-                                                         const char *service_name,
-                                                         const char *connection_path,
+                                                         NMConnection *connection,
+                                                         NMDevice *device,
+                                                         const char *specific_object,
+                                                         NMClientActivateFn callback,
+                                                         gpointer user_data);
+void                (*NMClientAddActivateFn)            (NMClient *client,
+                                                         NMActiveConnection *connection,
+                                                         const char *new_connection_path,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                nm_client_add_and_activate_connection
+                                                        (NMClient *client,
+                                                         NMConnection *partial,
                                                          NMDevice *device,
                                                          const char *specific_object,
-                                                         NMClientActivateDeviceFn callback,
+                                                         NMClientAddActivateFn callback,
                                                          gpointer user_data);
 void                nm_client_deactivate_connection     (NMClient *client,
                                                          NMActiveConnection *active);
@@ -83,6 +98,12 @@ const void                nm_client_wwan_set_enabled          (NMClient *client,
                                                          gboolean enabled);
 gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
+gboolean            nm_client_wimax_get_enabled         (NMClient *client);
+void                nm_client_wimax_set_enabled         (NMClient *client,
+                                                         gboolean enabled);
+gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);
+const char *        nm_client_get_version               (NMClient *client);
 NMState             nm_client_get_state                 (NMClient *client);
 gboolean            nm_client_get_manager_running       (NMClient *client);
 const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
@@ -93,7 +114,7 @@ const NMClientPermission permission);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -101,35 +122,46 @@ const 
+

 
Properties

 
-  "active-connections"       nm-object-array*      : Read
+  "active-connections"       NMObjectArray*        : Read
   "manager-running"          gboolean              : Read
-  "networking-enabled"       gboolean              : Read
+  "networking-enabled"       gboolean              : Read / Write
   "state"                    guint                 : Read
+  "version"                  gchar*                : Read
+  "wimax-enabled"            gboolean              : Read / Write
+  "wimax-hardware-enabled"   gboolean              : Read
   "wireless-enabled"         gboolean              : Read / Write
   "wireless-hardware-enabled" gboolean              : Read
-  "wwan-enabled"             gboolean              : Read / Write / Construct
-  "wwan-hardware-enabled"    gboolean              : Read / Write / Construct Only
+  "wwan-enabled"             gboolean              : Read / Write
+  "wwan-hardware-enabled"    gboolean              : Read
 

 

-

+

 
Signals

 
-  "device-added"                                   : Run First
-  "device-removed"                                 : Run First
-  "permission-changed"                             : Run First
+  "device-added"                                   : Run First
+  "device-removed"                                 : Run First
+  "permission-changed"                             : Run First
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

+
NM_CLIENT_VERSION

+
#define NM_CLIENT_VERSION "version"
+

+

+

+

+

+

 
NM_CLIENT_STATE

 
#define NM_CLIENT_STATE "state"
 

@@ -137,7 +169,7 @@ const 
+

 
NM_CLIENT_MANAGER_RUNNING

 
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
 

@@ -145,7 +177,7 @@ const 
+

 
NM_CLIENT_NETWORKING_ENABLED

 
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 

@@ -153,7 +185,7 @@ const 
+

 
NM_CLIENT_WIRELESS_ENABLED

 
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 

@@ -161,7 +193,7 @@ const 
+

 
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

 
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 

@@ -169,7 +201,7 @@ const 
+

 
NM_CLIENT_WWAN_ENABLED

 
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 

@@ -177,7 +209,7 @@ const 
+

 
NM_CLIENT_WWAN_HARDWARE_ENABLED

 
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 

@@ -185,7 +217,23 @@ const 
+

+
NM_CLIENT_WIMAX_ENABLED

+
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIMAX_HARDWARE_ENABLED

+
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
+

+

+

+

+

+

 
NM_CLIENT_ACTIVE_CONNECTIONS

 
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 

@@ -193,23 +241,30 @@ const 
+

 
enum NMClientPermission

 
typedef enum {
 	NM_CLIENT_PERMISSION_NONE = 0,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
-	NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS = 4,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4,
+	NM_CLIENT_PERMISSION_SLEEP_WAKE = 5,
+	NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11,
 
-	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS
+	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME
 } NMClientPermission;
 

 

 

 

 

-

+

 
enum NMClientPermissionResult

 
typedef enum {
 	NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0,
@@ -222,14 +277,14 @@ const 
+

 
NMClient

 
typedef struct _NMClient NMClient;

 

 

 

 

-

+

 
NMClientClass

 
typedef struct {
 	NMObjectClass parent;
@@ -237,6 +292,9 @@ const 
 

 

-

+

 
nm_client_new ()

 
NMClient *          nm_client_new                       (void);

 

@@ -261,13 +319,13 @@ Creates a new 
 
 
Returns :

- a new NMClient
+a new NMClient
 
 
 

 

 

-

+

 
nm_client_get_devices ()

 
const GPtrArray *   nm_client_get_devices               (NMClient *client);

 

@@ -283,15 +341,15 @@ Gets all the detected devices.
 
 
 
Returns :

- a GPtrArray containing all the NMDevices.
-The returned array is owned by the client and should not be modified.
+a GPtrArray containing all the NMDevices.
+The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.Device]
 
 
 
 

 

 

-

+

 
nm_client_get_device_by_path ()

 
NMDevice *          nm_client_get_device_by_path        (NMClient *client,
                                                          const char *object_path);

@@ -308,58 +366,112 @@ Gets a 
 
 
 
object_path :

-the object path to search for
-
+the object path to search for
 
 
 
Returns :

- the NMDevice for the given object_path or NULL if none is found.
+the NMDevice for the given object_path or NULL if none is found. [transfer none]
 
 
 
 

 

 

-

-
NMClientActivateDeviceFn ()

-
void                (*NMClientActivateDeviceFn)         (gpointer user_data,
-                                                         const char *object_path,
-                                                         GError *error);

+

+
NMClientActivateFn ()

+
void                (*NMClientActivateFn)               (NMClient *client,
+                                                         NMActiveConnection *active_connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
nm_client_activate_connection ()

+
void                nm_client_activate_connection       (NMClient *client,
+                                                         NMConnection *connection,
+                                                         NMDevice *device,
+                                                         const char *specific_object,
+                                                         NMClientActivateFn callback,
+                                                         gpointer user_data);

 

+Starts a connection to a particular network using the configuration settings
+from connection and the network device device.  Certain connection types
+also take a "specific object" which is the object path of a connection-
+specific object, like an NMAccessPoint for WiFi connections, or an
+NMWimaxNsp for WiMAX connections, to which you wish to connect.  If the
+specific object is not given, NetworkManager can, in some cases, automatically
+determine which network to connect to given the settings in connection.
 

 

-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
user_data :

+
client :
a NMClient
 
 

 
object_path :

+
connection :
an NMConnection
 
 

 
error :

+
device :
the NMDevice. [allow-none]
+
specific_object :
the object path of a connection-type-specific
+object this activation should use. This parameter is currently ignored for
+wired and mobile broadband connections, and the value of NULL should be used
+(ie, no specific object).  For WiFi or WiMAX connections, pass the object
+path of a NMAccessPoint or NMWimaxNsp owned by device, which you can
+get using nm_object_get_path(), and which will be used to complete the
+details of the newly added connection. [allow-none]
+
callback :
the function to call when the call is done. [scope async][allow-none]
+
user_data :
user data to pass to the callback function. [closure]
 
 

 
 

 

 

-

-
nm_client_activate_connection ()

-
void                nm_client_activate_connection       (NMClient *client,
-                                                         const char *service_name,
-                                                         const char *connection_path,
+

+
NMClientAddActivateFn ()

+
void                (*NMClientAddActivateFn)            (NMClient *client,
+                                                         NMActiveConnection *connection,
+                                                         const char *new_connection_path,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
nm_client_add_and_activate_connection ()

+
void                nm_client_add_and_activate_connection
+                                                        (NMClient *client,
+                                                         NMConnection *partial,
                                                          NMDevice *device,
                                                          const char *specific_object,
-                                                         NMClientActivateDeviceFn callback,
+                                                         NMClientAddActivateFn callback,
                                                          gpointer user_data);

 

-Activates a connection with the given NMDevice.
+Adds a new connection using the given details (if any) as a template,
+automatically filling in missing settings with the capabilities of the
+given device and specific object.  The new connection is then activated.
+Cannot be used for VPN connections at this time.
 

 
@@ -370,13 +482,10 @@ Activates a connection with the given 
 
 
-
-
-
-
-
-
+
@@ -386,25 +495,30 @@ Activates a connection with the given 
 
-
-
-

 

service_name :
the connection's service name
-
connection_path :
the connection's DBus path
+
partial :
an NMConnection to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
+using the given device and specific_object before being added. [allow-none]
 
 

 

 
specific_object :
the device specific object (currently used only for
-activating wireless devices and should be the NMAccessPoint's path.
+the object path of a connection-type-specific
+object this activation should use. This parameter is currently ignored for
+wired and mobile broadband connections, and the value of NULL should be used
+(ie, no specific object).  For WiFi or WiMAX connections, pass the object
+path of a NMAccessPoint or NMWimaxNsp owned by device, which you can
+get using nm_object_get_path(), and which will be used to complete the
+details of the newly added connection. [allow-none]
 
 

 

 
callback :
the function to call when the call is done
+the function to call when the call is done. [scope async][allow-none]
 
 

 

 
user_data :
user data to pass to the callback function
+user data to pass to the callback function. [closure]
 
 

 
 

 

 

-

+

 
nm_client_deactivate_connection ()

 
void                nm_client_deactivate_connection     (NMClient *client,
                                                          NMActiveConnection *active);

@@ -421,14 +535,13 @@ Deactivates an active active :

-the NMActiveConnection to deactivate
-
+the NMActiveConnection to deactivate
 
 
 

 

 

-

+

 
nm_client_networking_get_enabled ()

 
gboolean            nm_client_networking_get_enabled    (NMClient *client);

 

@@ -444,14 +557,14 @@ Whether networking is enabled or disabled.
 
 
 
Returns :

- TRUE if networking is enabled, FALSE if networking is disabled
-
+
+TRUE if networking is enabled, FALSE if networking is disabled
 
 
 

 

 

-

+

 
nm_client_networking_set_enabled ()

 
void                nm_client_networking_set_enabled    (NMClient *client,
                                                          gboolean enabled);

@@ -471,14 +584,13 @@ all controlled interfaces are available for activation.
 
 
enabled :

 
-TRUE to set networking enabled, FALSE to set networking disabled
-
+TRUE to set networking enabled, FALSE to set networking disabled
 
 
 

 

 

-

+

 
nm_client_wireless_get_enabled ()

 
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

 

@@ -494,14 +606,14 @@ Determines whether the wireless is enabled.
 
 
 
Returns :

- TRUE if wireless is enabled
-
+
+TRUE if wireless is enabled
 
 
 

 

 

-

+

 
nm_client_wireless_set_enabled ()

 
void                nm_client_wireless_set_enabled      (NMClient *client,
                                                          gboolean enabled);

@@ -519,14 +631,13 @@ Enables or disables wireless devices.
 
 
enabled :

 
-TRUE to enable wireless
-
+TRUE to enable wireless
 
 
 

 

 

-

+

 
nm_client_wireless_hardware_get_enabled ()

 
gboolean            nm_client_wireless_hardware_get_enabled
                                                         (NMClient *client);

@@ -543,14 +654,14 @@ Determines whether the wireless hardware is enabled.
 
 
 
Returns :

- TRUE if the wireless hardware is enabled
-
+
+TRUE if the wireless hardware is enabled
 
 
 

 

 

-

+

 
nm_client_wwan_get_enabled ()

 
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

 

@@ -566,14 +677,14 @@ Determines whether WWAN is enabled.
 
 
 
Returns :

- TRUE if WWAN is enabled
-
+
+TRUE if WWAN is enabled
 
 
 

 

 

-

+

 
nm_client_wwan_set_enabled ()

 
void                nm_client_wwan_set_enabled          (NMClient *client,
                                                          gboolean enabled);

@@ -591,14 +702,13 @@ Enables or disables WWAN devices.
 
 
enabled :

 
-TRUE to enable WWAN
-
+TRUE to enable WWAN
 
 
 

 

 

-

+

 
nm_client_wwan_hardware_get_enabled ()

 
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

 

@@ -614,14 +724,107 @@ Determines whether the WWAN hardware is enabled.
 
 
 
Returns :

- TRUE if the WWAN hardware is enabled
+
+TRUE if the WWAN hardware is enabled
+
+
+

+

+

+

+
nm_client_wimax_get_enabled ()

+
gboolean            nm_client_wimax_get_enabled         (NMClient *client);

+

+Determines whether WiMAX is enabled.
+

+

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


client :
a NMClient
+
Returns :

+TRUE if WiMAX is enabled

+

+

+

+
nm_client_wimax_set_enabled ()

+
void                nm_client_wimax_set_enabled         (NMClient *client,
+                                                         gboolean enabled);

+

+Enables or disables WiMAX devices.
+

+

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


client :
a NMClient
+
enabled :

+TRUE to enable WiMAX

+

+

+

+
nm_client_wimax_hardware_get_enabled ()

+
gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);

+

+Determines whether the WiMAX hardware is enabled.
+

+

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


client :
a NMClient
+
Returns :

+TRUE if the WiMAX hardware is enabled

+

+

+

+
nm_client_get_version ()

+
const char *        nm_client_get_version               (NMClient *client);

+

+Gets NetworkManager version.
+

+

++
+
+
+
+
+
+
+


client :
a NMClient
 
 
Returns :
string with the version

 
 

 

 

-

+

 
nm_client_get_state ()

 
NMState             nm_client_get_state                 (NMClient *client);

 

@@ -637,14 +840,14 @@ Gets the current daemon state.
 
 
 
Returns :

- the current NMState
+the current NMState
 
 
 
 

 

 

-

+

 
nm_client_get_manager_running ()

 
gboolean            nm_client_get_manager_running       (NMClient *client);

 

@@ -660,14 +863,14 @@ Determines whether the daemon is running.
 
 
 
Returns :

- TRUE if the daemon is running
-
+
+TRUE if the daemon is running
 
 
 

 

 

-

+

 
nm_client_get_active_connections ()

 
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

 

@@ -683,15 +886,16 @@ Gets the active connections.
 
 
 
Returns :

- a GPtrArray containing all the active NMActiveConnections.
-The returned array is owned by the client and should not be modified.
+a GPtrArray
+containing all the active NMActiveConnections.
+The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.ActiveConnection]
 
 
 
 

 

 

-

+

 
nm_client_sleep ()

 
void                nm_client_sleep                     (NMClient *client,
                                                          gboolean sleep);

@@ -709,14 +913,13 @@ Deprecated; use sleep :

 
-TRUE to put the daemon to sleep
-
+TRUE to put the daemon to sleep
 
 
 

 

 

-

+

 
nm_client_get_permission_result ()

 
NMClientPermissionResult  nm_client_get_permission_result
                                                         (NMClient *client,
@@ -740,80 +943,103 @@ client can or cannot perform the action the permission represents
 
 
 
Returns :

- the permission's result, one of NMClientPermissionResult
+the permission's result, one of NMClientPermissionResult
 
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "active-connections" property

-
  "active-connections"       nm-object-array*      : Read

+
  "active-connections"       NMObjectArray*        : Read

 
Active connections.

 

 

-

+

 
The "manager-running" property

 
  "manager-running"          gboolean              : Read

 
Whether NetworkManager is running.

 
Default value: FALSE

 

 

-

+

 
The "networking-enabled" property

-
  "networking-enabled"       gboolean              : Read

+
  "networking-enabled"       gboolean              : Read / Write

 
Is networking enabled.

 
Default value: TRUE

 

 

-

+

 
The "state" property

 
  "state"                    guint                 : Read

 

 The current daemon state.
 

-
Allowed values: <= 4

+
Allowed values: <= 70

 
Default value: 0

 

 

-

+

+
The "version" property

+
  "version"                  gchar*                : Read

+

+The NetworkManager version.
+

+
Default value: NULL

+

+

+

+
The "wimax-enabled" property

+
  "wimax-enabled"            gboolean              : Read / Write

+
Is WiMAX enabled.

+
Default value: FALSE

+

+

+

+
The "wimax-hardware-enabled" property

+
  "wimax-hardware-enabled"   gboolean              : Read

+
Is WiMAX hardware enabled.

+
Default value: FALSE

+

+

+

 
The "wireless-enabled" property

 
  "wireless-enabled"         gboolean              : Read / Write

 
Is wireless enabled.

-
Default value: TRUE

+
Default value: FALSE

 

 

-

+

 
The "wireless-hardware-enabled" property

 
  "wireless-hardware-enabled" gboolean              : Read

 
Is wireless hardware enabled.

 
Default value: TRUE

 

 

-

+

 
The "wwan-enabled" property

-
  "wwan-enabled"             gboolean              : Read / Write / Construct

+
  "wwan-enabled"             gboolean              : Read / Write

 
Is WWAN enabled.

-
Default value: TRUE

+
Default value: FALSE

 

 

-

+

 
The "wwan-hardware-enabled" property

-
  "wwan-hardware-enabled"    gboolean              : Read / Write / Construct Only

+
  "wwan-hardware-enabled"    gboolean              : Read

 
Is WWAN hardware enabled.

-
Default value: TRUE

+
Default value: FALSE

 

 

-

+

 
Signal Details

-

+

 
The "device-added" signal

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

+                                                        gpointer  user_data)      : Run First

 

 Notifies that a NMDevice is added.
 

@@ -822,12 +1048,11 @@ Notifies that a 
 
 
client :

-the client that received the signal
-
+the client that received the signal
 
 
 
device :

-the new device
+the new device. [type NMClient.Device]
 
 
 
@@ -838,11 +1063,11 @@ Notifies that a 

 

 

-

+

 
The "device-removed" signal

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

+                                                        gpointer  user_data)      : Run First

 

 Notifies that a NMDevice is removed.
 

@@ -851,12 +1076,11 @@ Notifies that a 
 
 
widget :

-the client that received the signal
-
+the client that received the signal
 
 
 
device :

-the removed device
+the removed device. [type NMClient.Device]
 
 
 
@@ -867,12 +1091,12 @@ Notifies that a 

 

 

-

+

 
The "permission-changed" signal

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

+                                                        gpointer  user_data)       : Run First

 

 Notifies that a permission has changed
 

@@ -881,8 +1105,7 @@ Notifies that a permission has changed
 
 
 
widget :

-the client that received the signal
-
+the client that received the signal
 
 
 
permission :

@@ -905,6 +1128,6 @@ Notifies that a permission has changed
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index fb2e06de..49a48faf 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -5,17 +5,17 @@
 NMDHCP4Config
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
                    NMDHCP4Config;
                     NMDHCP4ConfigClass;
@@ -51,7 +51,7 @@ const char *        const char *option);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -59,27 +59,27 @@ const char *        
+

 
Properties

 
   "options"                  GHashTable*           : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NMDHCP4Config

 
typedef struct _NMDHCP4Config NMDHCP4Config;

 

 

 

 

-

+

 
NMDHCP4ConfigClass

 
typedef struct {
 	NMObjectClass parent;
@@ -97,7 +97,7 @@ const char *        
+

 
NM_DHCP4_CONFIG_OPTIONS

 
#define NM_DHCP4_CONFIG_OPTIONS "options"
 

@@ -105,7 +105,7 @@ const char *        
+

 
nm_dhcp4_config_new ()

 
GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
                                                          const char *object_path);

@@ -122,19 +122,18 @@ Creates a new 
 
 
object_path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new configuration
+a new configuration. [transfer full]
 
 
 
 

 

 

-

+

 
nm_dhcp4_config_get_options ()

 
GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);

 

@@ -150,15 +149,15 @@ Gets all the options contained in the configuration.
 
 
 
Returns :

- the GHashTable containing strings for keys and values.
-This is the internal copy used by the configuration, and must not be modified.
+the GHashTable containing strings for keys and values.
+This is the internal copy used by the configuration, and must not be modified. [transfer none][element-type utf8 GObject.Value]
 
 
 
 

 

 

-

+

 
nm_dhcp4_config_get_one_option ()

 
const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
                                                          const char *option);

@@ -175,32 +174,34 @@ Gets one option by option name.
 
 
 
option :

-the option to retrieve
-
+the option to retrieve
 
 
 
Returns :

- the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.
-
+the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "options" property

 
  "options"                  GHashTable*           : Read

 

 The GHashTable containing options of the configuration.
 

+

+Type: GLib.HashTable
+Element-Type: utf8,GObject.Value
+

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 36f91a24..2b330a1b 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -5,20 +5,20 @@
 NMDHCP6Config
 
 
-
+
 
-
-
+
+
 
 
 
 
-
+
-
+
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
                    NMDHCP6Config;
                     NMDHCP6ConfigClass;
@@ -51,7 +51,7 @@ const char *        const char *option);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -59,27 +59,27 @@ const char *        
+

 
Properties

 
   "options"                  GHashTable*           : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NMDHCP6Config

 
typedef struct _NMDHCP6Config NMDHCP6Config;

 

 

 

 

-

+

 
NMDHCP6ConfigClass

 
typedef struct {
 	NMObjectClass parent;
@@ -97,7 +97,7 @@ const char *        
+

 
NM_DHCP6_CONFIG_OPTIONS

 
#define NM_DHCP6_CONFIG_OPTIONS "options"
 

@@ -105,7 +105,7 @@ const char *        
+

 
nm_dhcp6_config_new ()

 
GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
                                                          const char *object_path);

@@ -122,19 +122,18 @@ Creates a new 
 
 
object_path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new configuration
+a new configuration. [transfer full]
 
 
 
 

 

 

-

+

 
nm_dhcp6_config_get_options ()

 
GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);

 

@@ -150,15 +149,15 @@ Gets all the options contained in the configuration.
 
 
 
Returns :

- the GHashTable containing strings for keys and values.
-This is the internal copy used by the configuration, and must not be modified.
+the GHashTable containing strings for keys and values.
+This is the internal copy used by the configuration, and must not be modified. [transfer none][element-type utf8 GObject.Value]
 
 
 
 

 

 

-

+

 
nm_dhcp6_config_get_one_option ()

 
const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
                                                          const char *option);

@@ -175,32 +174,34 @@ Gets one option by option name.
 
 
 
option :

-the option to retrieve
-
+the option to retrieve
 
 
 
Returns :

- the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.
-
+the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "options" property

 
  "options"                  GHashTable*           : Read

 

 The GHashTable containing options of the configuration.
 

+

+Type: GLib.HashTable
+Element-Type: utf8,GObject.Value
+

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index da61cfdc..3af508c4 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -5,17 +5,17 @@
 NMDevice
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -32,7 +32,7 @@
                   Signals
-

+

 

 

 
@@ -41,9 +41,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_DEVICE_UDI
+
#define             NM_DEVICE_DEVICE_TYPE
+#define             NM_DEVICE_UDI
 #define             NM_DEVICE_INTERFACE
 #define             NM_DEVICE_IP_INTERFACE
 #define             NM_DEVICE_DRIVER
@@ -61,29 +62,34 @@
                     NMDeviceClass;
 GObject *           nm_device_new                       (DBusGConnection *connection,
                                                          const char *path);
-const char *        nm_device_get_iface                 (NMDevice *device);
-const char *        nm_device_get_ip_iface              (NMDevice *device);
-const char *        nm_device_get_udi                   (NMDevice *device);
-const char *        nm_device_get_driver                (NMDevice *device);
-guint32             nm_device_get_capabilities          (NMDevice *device);
+const char *          nm_device_get_iface               (NMDevice *device);
+const char *          nm_device_get_ip_iface            (NMDevice *device);
+NMDeviceType        nm_device_get_device_type           (NMDevice *device);
+const char *          nm_device_get_udi                 (NMDevice *device);
+const char *          nm_device_get_driver              (NMDevice *device);
+NMDeviceCapabilities  nm_device_get_capabilities        (NMDevice *device);
 gboolean            nm_device_get_managed               (NMDevice *device);
 gboolean            nm_device_get_firmware_missing      (NMDevice *device);
-NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);
-NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);
-NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);
-NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
+NMIP4Config *         nm_device_get_ip4_config          (NMDevice *device);
+NMDHCP4Config *       nm_device_get_dhcp4_config        (NMDevice *device);
+NMIP6Config *         nm_device_get_ip6_config          (NMDevice *device);
+NMDHCP6Config *       nm_device_get_dhcp6_config        (NMDevice *device);
 NMDeviceState       nm_device_get_state                 (NMDevice *device);
-const char *        nm_device_get_product               (NMDevice *device);
-const char *        nm_device_get_vendor                (NMDevice *device);
+const char *          nm_device_get_product             (NMDevice *device);
+const char *          nm_device_get_vendor              (NMDevice *device);
 void                (*NMDeviceDeactivateFn)             (NMDevice *device,
                                                          GError *error,
                                                          gpointer user_data);
 void                nm_device_disconnect                (NMDevice *device,
                                                          NMDeviceDeactivateFn callback,
                                                          gpointer user_data);
+GSList *              nm_device_filter_connections      (NMDevice *device,
+                                                         const GSList *connections);
+gboolean            nm_device_connection_valid          (NMDevice *device,
+                                                         NMConnection *connection);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -91,14 +97,16 @@ const char *        NMDeviceEthernet
                +----NMDeviceWifi
-               +----NMSerialDevice
+               +----NMDeviceModem
                +----NMDeviceBt
+               +----NMDeviceWimax
 

 

-

+

 
Properties

 
   "capabilities"             guint                 : Read
+  "device-type"              guint                 : Read / Write / Construct Only
   "dhcp4-config"             NMDHCP4Config*        : Read
   "dhcp6-config"             NMDHCP6Config*        : Read
   "driver"                   gchar*                : Read
@@ -114,20 +122,28 @@ const char *        vendor"                   gchar*                : Read
 

 

-

+

 
Signals

 
-  "state-changed"                                  : Run First
+  "state-changed"                                  : Run First
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

+
NM_DEVICE_DEVICE_TYPE

+
#define NM_DEVICE_DEVICE_TYPE "device-type"
+

+

+

+

+

+

 
NM_DEVICE_UDI

 
#define NM_DEVICE_UDI "udi"
 

@@ -135,7 +151,7 @@ const char *        
+

 
NM_DEVICE_INTERFACE

 
#define NM_DEVICE_INTERFACE "interface"
 

@@ -143,7 +159,7 @@ const char *        
+

 
NM_DEVICE_IP_INTERFACE

 
#define NM_DEVICE_IP_INTERFACE "ip-interface"
 

@@ -151,7 +167,7 @@ const char *        
+

 
NM_DEVICE_DRIVER

 
#define NM_DEVICE_DRIVER "driver"
 

@@ -159,7 +175,7 @@ const char *        
+

 
NM_DEVICE_CAPABILITIES

 
#define NM_DEVICE_CAPABILITIES "capabilities"
 

@@ -167,7 +183,7 @@ const char *        
+

 
NM_DEVICE_MANAGED

 
#define NM_DEVICE_MANAGED "managed"
 

@@ -175,7 +191,7 @@ const char *        
+

 
NM_DEVICE_FIRMWARE_MISSING

 
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

@@ -183,7 +199,7 @@ const char *        
+

 
NM_DEVICE_IP4_CONFIG

 
#define NM_DEVICE_IP4_CONFIG "ip4-config"
 

@@ -191,7 +207,7 @@ const char *        
+

 
NM_DEVICE_DHCP4_CONFIG

 
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 

@@ -199,7 +215,7 @@ const char *        
+

 
NM_DEVICE_IP6_CONFIG

 
#define NM_DEVICE_IP6_CONFIG "ip6-config"
 

@@ -207,7 +223,7 @@ const char *        
+

 
NM_DEVICE_DHCP6_CONFIG

 
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 

@@ -215,7 +231,7 @@ const char *        
+

 
NM_DEVICE_STATE

 
#define NM_DEVICE_STATE "state"
 

@@ -223,7 +239,7 @@ const char *        
+

 
NM_DEVICE_VENDOR

 
#define NM_DEVICE_VENDOR "vendor"
 

@@ -231,7 +247,7 @@ const char *        
+

 
NM_DEVICE_PRODUCT

 
#define NM_DEVICE_PRODUCT "product"
 

@@ -239,14 +255,14 @@ const char *        
+

 
NMDevice

 
typedef struct _NMDevice NMDevice;

 

 

 

 

-

+

 
NMDeviceClass

 
typedef struct {
 	NMObjectClass parent;
@@ -257,6 +273,9 @@ const char *        char *        
+

 
nm_device_new ()

 
GObject *           nm_device_new                       (DBusGConnection *connection,
                                                          const char *path);

@@ -287,21 +306,20 @@ Creates a new 
 
 
path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new device
+a new device. [transfer full]
 
 
 
 

 

 

-

+

 
nm_device_get_iface ()

-
const char *        nm_device_get_iface                 (NMDevice *device);

+
const char *          nm_device_get_iface               (NMDevice *device);

 

 Gets the interface name of the NMDevice.
 

@@ -315,17 +333,16 @@ Gets the interface name of the Returns :

- the interface of the device. This is the internal string used by the
-device, and must not be modified.
-
+the interface of the device. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_get_ip_iface ()

-
const char *        nm_device_get_ip_iface              (NMDevice *device);

+
const char *          nm_device_get_ip_iface            (NMDevice *device);

 

 Gets the IP interface name of the NMDevice over which IP traffic flows
 when the device is in the ACTIVATED state.
@@ -340,17 +357,38 @@ when the device is in the ACTIVATED state.
 
 
 
Returns :

- the IP traffic interface of the device. This is the internal string
-used by the device, and must not be modified.
+the IP traffic interface of the device. This is the internal string
+used by the device, and must not be modified.
+
+
+

+

+

+

+
nm_device_get_device_type ()

+
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

+

+Returns the numeric type of the NMDevice, ie ethernet, wifi, etc.
+

+

++
+
+
+
+
+
+
+


device :
a NMDevice
 
 
Returns :
the device type

 
 

 

 

-

+

 
nm_device_get_udi ()

-
const char *        nm_device_get_udi                   (NMDevice *device);

+
const char *          nm_device_get_udi                 (NMDevice *device);

 

 Gets the Unique Device Identifier of the NMDevice.
 

@@ -364,18 +402,17 @@ Gets the Unique Device Identifier of the 
 
 
Returns :

- the Unique Device Identifier of the device.  This identifier may be
+the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
-system services like udev or sysfs.
-
+system services like udev or sysfs.
 
 
 

 

 

-

+

 
nm_device_get_driver ()

-
const char *        nm_device_get_driver                (NMDevice *device);

+
const char *          nm_device_get_driver              (NMDevice *device);

 

 Gets the driver of the NMDevice.
 

@@ -389,17 +426,16 @@ Gets the driver of the 
 
 
Returns :

- the driver of the device. This is the internal string used by the
-device, and must not be modified.
-
+the driver of the device. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_get_capabilities ()

-
guint32             nm_device_get_capabilities          (NMDevice *device);

+
NMDeviceCapabilities  nm_device_get_capabilities        (NMDevice *device);

 

 Gets the device' capabilities.
 

@@ -413,14 +449,13 @@ Gets the device' capabilities.
 
 
 
Returns :

- the capabilities
-
+the capabilities
 
 
 

 

 

-

+

 
nm_device_get_managed ()

 
gboolean            nm_device_get_managed               (NMDevice *device);

 

@@ -436,14 +471,14 @@ Whether the Returns :

- TRUE if the device is managed by NetworkManager
-
+
+TRUE if the device is managed by NetworkManager
 
 
 

 

 

-

+

 
nm_device_get_firmware_missing ()

 
gboolean            nm_device_get_firmware_missing      (NMDevice *device);

 

@@ -460,17 +495,17 @@ to be missing.
 
 
 
Returns :

- TRUE if firmware required for the device's operation is likely
-to be missing.
-
+
+TRUE if firmware required for the device's operation is likely
+to be missing.
 
 
 

 

 

-

+

 
nm_device_get_ip4_config ()

-
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

+
NMIP4Config *         nm_device_get_ip4_config          (NMDevice *device);

 

 Gets the current NMIP4Config associated with the NMDevice.
 

@@ -484,16 +519,16 @@ Gets the current 
 
 
Returns :

- the NMIP4Config or NULL if the device is not activated.
+the NMIP4Config or NULL if the device is not activated. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_get_dhcp4_config ()

-
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

+
NMDHCP4Config *       nm_device_get_dhcp4_config        (NMDevice *device);

 

 Gets the current NMDHCP4Config associated with the NMDevice.
 

@@ -507,17 +542,17 @@ Gets the current 
 
 
Returns :

- the NMDHCPConfig or NULL if the device is not activated or not
-using DHCP.
+the NMDHCPConfig or NULL if the device is not activated or not
+using DHCP. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_get_ip6_config ()

-
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

+
NMIP6Config *         nm_device_get_ip6_config          (NMDevice *device);

 

 Gets the current NMIP6Config associated with the NMDevice.
 

@@ -531,16 +566,16 @@ Gets the current 
 
 
Returns :

- the NMIP6Config or NULL if the device is not activated.
+the NMIP6Config or NULL if the device is not activated. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_get_dhcp6_config ()

-
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

+
NMDHCP6Config *       nm_device_get_dhcp6_config        (NMDevice *device);

 

 Gets the current NMDHCP6Config associated with the NMDevice.
 

@@ -554,15 +589,15 @@ Gets the current 
 
 
Returns :

- the NMDHCPConfig or NULL if the device is not activated or not
-using DHCP.
+the NMDHCPConfig or NULL if the device is not activated or not
+using DHCP. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_get_state ()

 
NMDeviceState       nm_device_get_state                 (NMDevice *device);

 

@@ -578,16 +613,15 @@ Gets the current 
 
 
Returns :

- the current device state
-
+the current device state
 
 
 

 

 

-

+

 
nm_device_get_product ()

-
const char *        nm_device_get_product               (NMDevice *device);

+
const char *          nm_device_get_product             (NMDevice *device);

 

 Gets the product string of the NMDevice.
 

@@ -601,17 +635,16 @@ Gets the product string of the Returns :

- the product name of the device. This is the internal string used by the
-device, and must not be modified.
-
+the product name of the device. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_get_vendor ()

-
const char *        nm_device_get_vendor                (NMDevice *device);

+
const char *          nm_device_get_vendor              (NMDevice *device);

 

 Gets the vendor string of the NMDevice.
 

@@ -625,78 +658,130 @@ Gets the vendor string of the Returns :

- the vendor name of the device. This is the internal string used by the
-device, and must not be modified.
-
+the vendor name of the device. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
NMDeviceDeactivateFn ()

 
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
                                                          GError *error,
                                                          gpointer user_data);

 

 

+

+

+

+
nm_device_disconnect ()

+
void                nm_device_disconnect                (NMDevice *device,
+                                                         NMDeviceDeactivateFn callback,
+                                                         gpointer user_data);

+

+Disconnects the device if currently connected, and prevents the device from
+automatically connecting to networks until the next manual network connection
+request.
+

 

-
-
-
+
-

 
 
 

 
device :

+a NMDevice
 
 

 
error :

+
callback :
callback to be called when disconnect operation completes. [scope async]
 
 

 

 
user_data :

+caller-specific data passed to callback
 
 

 
 

 

 

-

-
nm_device_disconnect ()

-
void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
-                                                         gpointer user_data);

+

+
nm_device_filter_connections ()

+
GSList *              nm_device_filter_connections      (NMDevice *device,
+                                                         const GSList *connections);

 

-Disconnects the device if currently connected, and prevents the device from
-automatically connecting to networks until the next manual network connection
-request.
+Filters a given list of connections for a given NMDevice object and return
+connections which may be activated with the device. For example if device
+is a WiFi device that supports only WEP encryption, the returned list will
+contain any WiFi connections in connections that allow connection to
+unencrypted or WEP-enabled SSIDs.  The returned list will not contain
+Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is
+incompatible with the device.
 

 

-
+
+
+
+
-
-
+
+
+

 
 
 

 
device :
a NMDevice
+an NMDevice to filter connections for
connections :
a list of NMConnection objects to filter. [element-type NetworkManager.Connection]
 
 

 
callback :
callback to be called when disconnect operation completes
+
Returns :
a
+list of NMConnection objects that could be activated with the given device.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
 
 

+

+

+

+
nm_device_connection_valid ()

+
gboolean            nm_device_connection_valid          (NMDevice *device,
+                                                         NMConnection *connection);

+

+Validates a given connection for a given NMDevice object and returns
+whether the connection may be activated with the device. For example if
+device is a WiFi device that supports only WEP encryption, the connection
+will only be valid if it is a WiFi connection which describes a WEP or open
+network, and will not be valid if it describes a WPA network, or if it is
+an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the
+device.
+

+

++
-
-
+
+
+
+
+
+
+
+
+


 
user_data :
caller-specific data passed to callback
+
device :
an NMDevice to validate connection against
connection :
an NMConnection to validate against device
 
 
Returns :

+TRUE if the connection may be activated with this device, FALSE
+if is incompatible with the device's capabilities and characteristics.

 
 

 

 

-

+

 
Property Details

-

+

 
The "capabilities" property

 
  "capabilities"             guint                 : Read

 

@@ -705,7 +790,16 @@ The capabilities of the device.
 
Default value: 0

 

 

-

+

+
The "device-type" property

+
  "device-type"              guint                 : Read / Write / Construct Only

+

+The numeric type of the device.
+

+
Default value: 0

+

+

+

 
The "dhcp4-config" property

 
  "dhcp4-config"             NMDHCP4Config*        : Read

 

@@ -713,7 +807,7 @@ The 
 

 

-

+

 
The "dhcp6-config" property

 
  "dhcp6-config"             NMDHCP6Config*        : Read

 

@@ -721,7 +815,7 @@ The 
 

 

-

+

 
The "driver" property

 
  "driver"                   gchar*                : Read

 

@@ -730,7 +824,7 @@ The driver of the device.
 
Default value: NULL

 

 

-

+

 
The "firmware-missing" property

 
  "firmware-missing"         gboolean              : Read

 

@@ -740,7 +834,7 @@ for its operation.
 
Default value: FALSE

 

 

-

+

 
The "interface" property

 
  "interface"                gchar*                : Read

 

@@ -749,7 +843,7 @@ The interface of the device.
 
Default value: NULL

 

 

-

+

 
The "ip-interface" property

 
  "ip-interface"             gchar*                : Read

 

@@ -759,7 +853,7 @@ operations like addressing and routing.
 
Default value: NULL

 

 

-

+

 
The "ip4-config" property

 
  "ip4-config"               NMIP4Config*          : Read

 

@@ -767,7 +861,7 @@ The 
+

 
The "ip6-config" property

 
  "ip6-config"               NMIP6Config*          : Read

 

@@ -775,7 +869,7 @@ The 
+

 
The "managed" property

 
  "managed"                  gboolean              : Read

 

@@ -784,7 +878,7 @@ Whether the device is managed by NetworkManager.
 
Default value: FALSE

 

 

-

+

 
The "product" property

 
  "product"                  gchar*                : Read

 

@@ -793,7 +887,7 @@ The product string of the device.
 
Default value: NULL

 

 

-

+

 
The "state" property

 
  "state"                    guint                 : Read

 

@@ -802,16 +896,21 @@ The state of the device.
 
Default value: 0

 

 

-

+

 
The "udi" property

 
  "udi"                      gchar*                : Read

 

-The Unique Device Identifier of the device.
+An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.
 

 
Default value: NULL

 

 

-

+

 
The "vendor" property

 
  "vendor"                   gchar*                : Read

 

@@ -820,15 +919,15 @@ The vendor string of the device.
 
Default value: NULL

 

 

-

+

 
Signal Details

-

+

 
The "state-changed" signal

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

+                                                        gpointer  user_data)      : Run First

 

 Notifies the state change of a NMDevice.
 

@@ -837,13 +936,11 @@ Notifies the state change of a device :

-the client that received the signal
-
+the client that received the signal
 
 
 
state :

-the new state of the device
-
+the new state of the device
 
 
 
user_data :

@@ -856,6 +953,6 @@ Notifies the state change of a 
 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index d15fc7b6..6618973f 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -5,20 +5,20 @@
 NMDeviceBt
 
 
-
-
-
-
+
+
+
+
 
 
 
 
-
-
+
+
-
+
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_DEVICE_BT_HW_ADDRESS
 #define             NM_DEVICE_BT_NAME
@@ -53,7 +53,7 @@ const char *        NMBluetoothCapabilities  nm_device_bt_get_capabilities  (NMDeviceBt *device);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -62,7 +62,7 @@ const char *        
+

 
Properties

 
   "bt-capabilities"          guint                 : Read
@@ -70,14 +70,14 @@ const char *        name"                     gchar*                : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_DEVICE_BT_HW_ADDRESS

 
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 

@@ -85,7 +85,7 @@ const char *        
+

 
NM_DEVICE_BT_NAME

 
#define NM_DEVICE_BT_NAME         "name"
 

@@ -93,7 +93,7 @@ const char *        
+

 
NM_DEVICE_BT_CAPABILITIES

 
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 

@@ -101,14 +101,14 @@ const char *        
+

 
NMDeviceBt

 
typedef struct _NMDeviceBt NMDeviceBt;

 

 

 

 

-

+

 
NMDeviceBtClass

 
typedef struct {
 	NMDeviceClass parent;
@@ -126,7 +126,7 @@ const char *        
+

 
nm_device_bt_new ()

 
GObject *           nm_device_bt_new                    (DBusGConnection *connection,
                                                          const char *path);

@@ -143,19 +143,18 @@ Creates a new 
 
 
path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new device
+a new device. [transfer full]
 
 
 
 

 

 

-

+

 
nm_device_bt_get_hw_address ()

 
const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);

 

@@ -171,15 +170,14 @@ Gets the hardware (MAC) address of the 
 
 
Returns :

- the hardware address. This is the internal string used by the
-device, and must not be modified.
-
+the hardware address. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_bt_get_name ()

 
const char *        nm_device_bt_get_name               (NMDeviceBt *device);

 

@@ -195,14 +193,13 @@ Gets the name of the <
 
 
 
Returns :

- the name of the device
-
+the name of the device
 
 
 

 

 

-

+

 
nm_device_bt_get_capabilities ()

 
NMBluetoothCapabilities  nm_device_bt_get_capabilities  (NMDeviceBt *device);

 

@@ -218,16 +215,16 @@ Returns the Bluetooth device's usable capabilities.
 
 
 
Returns :

- a combination of NMBluetoothCapabilities
+a combination of NMBluetoothCapabilities
 
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "bt-capabilities" property

 
  "bt-capabilities"          guint                 : Read

 

@@ -236,7 +233,7 @@ The device's bluetooth capabilities, a combination of NMBluet
 
Default value: 0

 

 

-

+

 
The "hw-address" property

 
  "hw-address"               gchar*                : Read

 

@@ -245,7 +242,7 @@ The hardware (MAC) address of the device.
 
Default value: NULL

 

 

-

+

 
The "name" property

 
  "name"                     gchar*                : Read

 

@@ -257,6 +254,6 @@ The name of the bluetooth device.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 736f532a..8dd99479 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -5,17 +5,17 @@
 NMDeviceEthernet
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_DEVICE_ETHERNET_HW_ADDRESS
 #define             NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
@@ -56,7 +56,7 @@ const char *        gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -65,7 +65,7 @@ const char *        
+

 
Properties

 
   "carrier"                  gboolean              : Read
@@ -74,14 +74,14 @@ const char *        speed"                    guint                 : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_DEVICE_ETHERNET_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 

@@ -89,7 +89,7 @@ const char *        
+

 
NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 

@@ -97,7 +97,7 @@ const char *        
+

 
NM_DEVICE_ETHERNET_SPEED

 
#define NM_DEVICE_ETHERNET_SPEED       "speed"
 

@@ -105,7 +105,7 @@ const char *        
+

 
NM_DEVICE_ETHERNET_CARRIER

 
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 

@@ -113,14 +113,14 @@ const char *        
+

 
NMDeviceEthernet

 
typedef struct _NMDeviceEthernet NMDeviceEthernet;

 

 

 

 

-

+

 
NMDeviceEthernetClass

 
typedef struct {
 	NMDeviceClass parent;
@@ -138,7 +138,7 @@ const char *        
+

 
nm_device_ethernet_new ()

 
GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
                                                          const char *path);

@@ -155,19 +155,18 @@ Creates a new path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new device
+a new device. [transfer full]
 
 
 
 

 

 

-

+

 
nm_device_ethernet_get_hw_address ()

 
const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);

 

@@ -183,15 +182,14 @@ Gets the active hardware (MAC) address of the Returns :

- the active hardware address. This is the internal string used by the
-device, and must not be modified.
-
+the active hardware address. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_ethernet_get_permanent_hw_address ()

 
const char *        nm_device_ethernet_get_permanent_hw_address
                                                         (NMDeviceEthernet *device);

@@ -208,15 +206,14 @@ Gets the permanent hardware (MAC) address of the Returns :

- the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
-
+the permanent hardware address. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_ethernet_get_speed ()

 
guint32             nm_device_ethernet_get_speed        (NMDeviceEthernet *device);

 

@@ -232,14 +229,13 @@ Gets the speed of the Returns :

- the speed of the device
-
+the speed of the device
 
 
 

 

 

-

+

 
nm_device_ethernet_get_carrier ()

 
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

 

@@ -255,16 +251,16 @@ Whether the device has carrier.
 
 
 
Returns :

- TRUE if the device has carrier
-
+
+TRUE if the device has carrier
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "carrier" property

 
  "carrier"                  gboolean              : Read

 

@@ -273,7 +269,7 @@ Whether the device has carrier.
 
Default value: FALSE

 

 

-

+

 
The "hw-address" property

 
  "hw-address"               gchar*                : Read

 

@@ -282,7 +278,7 @@ The active hardware (MAC) address of the device.
 
Default value: NULL

 

 

-

+

 
The "perm-hw-address" property

 
  "perm-hw-address"          gchar*                : Read

 

@@ -291,7 +287,7 @@ The permanent hardware (MAC) address of the device.
 
Default value: NULL

 

 

-

+

 
The "speed" property

 
  "speed"                    guint                 : Read

 

@@ -303,6 +299,6 @@ The speed of the device.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
new file mode 100644
index 00000000..79db5c9d
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -0,0 +1,198 @@
+
+
+
+
+NMDeviceModem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceModem

+
NMDeviceModem

+

+

+
Synopsis

+
#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
+#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+                    NMDeviceModem;
+                    NMDeviceModemClass;
+NMDeviceModemCapabilities  nm_device_modem_get_modem_capabilities
+                                                        (NMDeviceModem *self);
+NMDeviceModemCapabilities  nm_device_modem_get_current_capabilities
+                                                        (NMDeviceModem *self);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceModem
+

+

+

+
Properties

+
+  "current-capabilities"     guint                 : Read
+  "modem-capabilities"       guint                 : Read
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NM_DEVICE_MODEM_MODEM_CAPABILITIES

+
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
+

+

+

+

+

+

+
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

+
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+

+

+

+

+

+

+
NMDeviceModem

+
typedef struct _NMDeviceModem NMDeviceModem;

+

+

+

+

+

+
NMDeviceModemClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceModemClass;
+

+

+

+

+

+

+
nm_device_modem_get_modem_capabilities ()

+
NMDeviceModemCapabilities  nm_device_modem_get_modem_capabilities
+                                                        (NMDeviceModem *self);

+

+Returns a bitfield of the generic access technology families the modem
+supports.  Not all capabilities are available concurrently however; some
+may require a firmware reload or reinitialization.
+

+

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


self :
a NMDeviceModem
+
Returns :
the generic access technology families the modem supports

+

+

+

+
nm_device_modem_get_current_capabilities ()

+
NMDeviceModemCapabilities  nm_device_modem_get_current_capabilities
+                                                        (NMDeviceModem *self);

+

+Returns a bitfield of the generic access technology families the modem
+supports without a firmware reload or reinitialization.  This value
+represents the network types the modem can immediately connect to.
+

+

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


self :
a NMDeviceModem
+
Returns :
the generic access technology families the modem supports without
+a firmware reload or other reinitialization

+

+

+

+
Property Details

+

+
The "current-capabilities" property

+
  "current-capabilities"     guint                 : Read

+

+The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.
+

+
Default value: 0

+

+

+

+
The "modem-capabilities" property

+
  "modem-capabilities"       guint                 : Read

+

+The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.
+

+
Default value: 0

+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index b4078b37..e7ddf0a9 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -5,20 +5,20 @@
 NMDeviceWifi
 
 
-
+
 
-
-
+
+
 
 
 
 
-
+
-
+
-

+

 

 

 
@@ -41,7 +41,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_DEVICE_WIFI_HW_ADDRESS
 #define             NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
@@ -53,21 +53,23 @@
                     NMDeviceWifiClass;
 GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
                                                          const char *path);
-const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);
-const char *        nm_device_wifi_get_permanent_hw_address
+const char *              nm_device_wifi_get_hw_address (NMDeviceWifi *device);
+const char *              nm_device_wifi_get_permanent_hw_address
                                                         (NMDeviceWifi *device);
 NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
 guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);
-guint32             nm_device_wifi_get_capabilities     (NMDeviceWifi *device);
-NMAccessPoint *     nm_device_wifi_get_active_access_point
+NMDeviceWifiCapabilities  nm_device_wifi_get_capabilities
                                                         (NMDeviceWifi *device);
-NMAccessPoint *     nm_device_wifi_get_access_point_by_path
+NMAccessPoint *           nm_device_wifi_get_active_access_point
+                                                        (NMDeviceWifi *device);
+NMAccessPoint *           nm_device_wifi_get_access_point_by_path
                                                         (NMDeviceWifi *device,
                                                          const char *path);
-const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
+const GPtrArray *         nm_device_wifi_get_access_points
+                                                        (NMDeviceWifi *device);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -76,7 +78,7 @@ const 
+

 
Properties

 
   "active-access-point"      NMAccessPoint*        : Read
@@ -87,21 +89,21 @@ const wireless-capabilities"    guint                 : Read
 

 

-

+

 
Signals

 
-  "access-point-added"                             : Run First
-  "access-point-removed"                           : Run First
+  "access-point-added"                             : Run First
+  "access-point-removed"                           : Run First
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_DEVICE_WIFI_HW_ADDRESS

 
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

@@ -109,7 +111,7 @@ const 
+

 
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 

@@ -117,7 +119,7 @@ const 
+

 
NM_DEVICE_WIFI_MODE

 
#define NM_DEVICE_WIFI_MODE                "mode"
 

@@ -125,7 +127,7 @@ const 
+

 
NM_DEVICE_WIFI_BITRATE

 
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 

@@ -133,7 +135,7 @@ const 
+

 
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

 
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

@@ -141,7 +143,7 @@ const 
+

 
NM_DEVICE_WIFI_CAPABILITIES

 
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 

@@ -149,14 +151,14 @@ const 
+

 
NMDeviceWifi

 
typedef struct _NMDeviceWifi NMDeviceWifi;

 

 

 

 

-

+

 
NMDeviceWifiClass

 
typedef struct {
 	NMDeviceClass parent;
@@ -178,7 +180,7 @@ const 
+

 
nm_device_wifi_new ()

 
GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
                                                          const char *path);

@@ -195,21 +197,20 @@ Creates a new 
 
 
path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new device
+a new WiFi device. [transfer full]
 
 
 
 

 

 

-

+

 
nm_device_wifi_get_hw_address ()

-
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

+
const char *              nm_device_wifi_get_hw_address (NMDeviceWifi *device);

 

 Gets the actual hardware (MAC) address of the NMDeviceWifi
 

@@ -223,17 +224,16 @@ Gets the actual hardware (MAC) address of the Returns :

- the actual hardware address. This is the internal string used by the
-device, and must not be modified.
-
+the actual hardware address. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_wifi_get_permanent_hw_address ()

-
const char *        nm_device_wifi_get_permanent_hw_address
+
const char *              nm_device_wifi_get_permanent_hw_address
                                                         (NMDeviceWifi *device);

 

 Gets the permanent hardware (MAC) address of the NMDeviceWifi
@@ -248,15 +248,14 @@ Gets the permanent hardware (MAC) address of the Returns :

- the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
-
+the permanent hardware address. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
nm_device_wifi_get_mode ()

 
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

 

@@ -272,14 +271,13 @@ Gets the 
 
 
Returns :

- the mode
-
+the mode
 
 
 

 

 

-

+

 
nm_device_wifi_get_bitrate ()

 
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

 

@@ -295,16 +293,16 @@ Gets the bit rate of the Returns :

- the bit rate
-
+the bit rate
 
 
 

 

 

-

+

 
nm_device_wifi_get_capabilities ()

-
guint32             nm_device_wifi_get_capabilities     (NMDeviceWifi *device);

+
NMDeviceWifiCapabilities  nm_device_wifi_get_capabilities
+                                                        (NMDeviceWifi *device);

 

 Gets the WIFI capabilities of the NMDeviceWifi.
 

@@ -318,16 +316,15 @@ Gets the WIFI capabilities of the 
 
 
Returns :

- the capabilities
-
+the capabilities
 
 
 

 

 

-

+

 
nm_device_wifi_get_active_access_point ()

-
NMAccessPoint *     nm_device_wifi_get_active_access_point
+
NMAccessPoint *           nm_device_wifi_get_active_access_point
                                                         (NMDeviceWifi *device);

 

 Gets the active NMAccessPoint.
@@ -342,16 +339,16 @@ Gets the active 
 
 
 
Returns :

- the access point or NULL if none is active
+the access point or NULL if none is active. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_wifi_get_access_point_by_path ()

-
NMAccessPoint *     nm_device_wifi_get_access_point_by_path
+
NMAccessPoint *           nm_device_wifi_get_access_point_by_path
                                                         (NMDeviceWifi *device,
                                                          const char *path);

 

@@ -367,21 +364,21 @@ Gets a 
 
 
path :

-the object path of the access point
-
+the object path of the access point
 
 
 
Returns :

- the access point or NULL if none is found.
+the access point or NULL if none is found. [transfer none]
 
 
 
 

 

 

-

+

 
nm_device_wifi_get_access_points ()

-
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

+
const GPtrArray *         nm_device_wifi_get_access_points
+                                                        (NMDeviceWifi *device);

 

 Gets all the scanned access points of the NMDeviceWifi.
 

@@ -395,17 +392,18 @@ Gets all the scanned access points of the Returns :

- a GPtrArray containing all the scanned NMAccessPoints.
-The returned array is owned by the client and should not be modified.
+a GPtrArray containing all the
+scanned NMAccessPoints.
+The returned array is owned by the client and should not be modified. [element-type NMClient.AccessPoint]
 
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "active-access-point" property

 
  "active-access-point"      NMAccessPoint*        : Read

 

@@ -413,7 +411,7 @@ The active 
 

 

-

+

 
The "bitrate" property

 
  "bitrate"                  guint                 : Read

 

@@ -422,7 +420,7 @@ The bit rate of the device.
 
Default value: 0

 

 

-

+

 
The "hw-address" property

 
  "hw-address"               gchar*                : Read

 

@@ -431,7 +429,7 @@ The hardware (MAC) address of the device.
 
Default value: NULL

 

 

-

+

 
The "mode" property

 
  "mode"                     guint                 : Read

 

@@ -441,7 +439,7 @@ The mode of the device.
 
Default value: 2

 

 

-

+

 
The "perm-hw-address" property

 
  "perm-hw-address"          gchar*                : Read

 

@@ -450,7 +448,7 @@ The hardware (MAC) address of the device.
 
Default value: NULL

 

 

-

+

 
The "wireless-capabilities" property

 
  "wireless-capabilities"    guint                 : Read

 

@@ -459,13 +457,13 @@ The wireless capabilities of the device.
 
Default value: 0

 

 

-

+

 
Signal Details

-

+

 
The "access-point-added" signal

 
void                user_function                      (NMDeviceWifi *device,
                                                         GObject      *ap,
-                                                        gpointer      user_data)      : Run First

+                                                        gpointer      user_data)      : Run First

 

 Notifies that a NMAccessPoint is added to the wifi device.
 

@@ -474,13 +472,11 @@ Notifies that a 
 
 
 
device :

-the wifi device that received the signal
-
+the wifi device that received the signal
 
 
 
ap :

-the new access point
-
+the new access point
 
 
 
user_data :

@@ -490,11 +486,11 @@ Notifies that a 
 

 

 

-

+

 
The "access-point-removed" signal

 
void                user_function                      (NMDeviceWifi *device,
                                                         GObject      *ap,
-                                                        gpointer      user_data)      : Run First

+                                                        gpointer      user_data)      : Run First

 

 Notifies that a NMAccessPoint is removed from the wifi device.
 

@@ -503,13 +499,11 @@ Notifies that a 
 
 
 
device :

-the wifi device that received the signal
-
+the wifi device that received the signal
 
 
 
ap :

-the removed access point
-
+the removed access point
 
 
 
user_data :

@@ -522,6 +516,6 @@ Notifies that a 
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
new file mode 100644
index 00000000..a9b65251
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -0,0 +1,564 @@
+
+
+
+
+NMDeviceWimax
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceWimax

+
NMDeviceWimax

+

+

+
Synopsis

+
#define             NM_DEVICE_WIMAX_HW_ADDRESS
+#define             NM_DEVICE_WIMAX_ACTIVE_NSP
+#define             NM_DEVICE_WIMAX_CENTER_FREQUENCY
+#define             NM_DEVICE_WIMAX_RSSI
+#define             NM_DEVICE_WIMAX_CINR
+#define             NM_DEVICE_WIMAX_TX_POWER
+#define             NM_DEVICE_WIMAX_BSID
+                    NMDeviceWimax;
+                    NMDeviceWimaxClass;
+GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
+                                                         const char *path);
+const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
+NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
+NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
+                                                         const char *path);
+const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);
+guint               nm_device_wimax_get_center_frequency
+                                                        (NMDeviceWimax *self);
+gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);
+gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
+gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);
+const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceWimax
+

+

+

+
Properties

+
+  "active-nsp"               NMWimaxNsp*           : Read
+  "bsid"                     gchar*                : Read
+  "center-frequency"         guint                 : Read
+  "cinr"                     gint                  : Read
+  "hw-address"               gchar*                : Read
+  "rssi"                     gint                  : Read
+  "tx-power"                 gint                  : Read
+

+

+

+
Signals

+
+  "nsp-added"                                      : Run First
+  "nsp-removed"                                    : Run First
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NM_DEVICE_WIMAX_HW_ADDRESS

+
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_ACTIVE_NSP

+
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_CENTER_FREQUENCY

+
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_RSSI

+
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_CINR

+
#define NM_DEVICE_WIMAX_CINR             "cinr"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_TX_POWER

+
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
+

+

+

+

+

+

+
NM_DEVICE_WIMAX_BSID

+
#define NM_DEVICE_WIMAX_BSID             "bsid"
+

+

+

+

+

+

+
NMDeviceWimax

+
typedef struct _NMDeviceWimax NMDeviceWimax;

+

+

+

+

+

+
NMDeviceWimaxClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Signals */
+	void (*nsp_added)   (NMDeviceWimax *self, NMWimaxNsp *nsp);
+	void (*nsp_removed) (NMDeviceWimax *self, NMWimaxNsp *nsp);
+} NMDeviceWimaxClass;
+

+

+

+

+

+

+
nm_device_wimax_new ()

+
GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceWimax.
+

+

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


connection :
the DBusGConnection
+
path :
the D-Bus object path of the WiMAX device
Returns :
a new WiMAX device. [transfer full]
+

+

+

+

+
nm_device_wimax_get_hw_address ()

+
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

+

+Gets the hardware (MAC) address of the NMDeviceWimax
+

+

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


wimax :
a NMDeviceWimax
+
Returns :
the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_wimax_get_active_nsp ()

+
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

+

+Gets the active NMWimaxNsp.
+

+

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


wimax :
a NMDeviceWimax
+
Returns :
the access point or NULL if none is active. [transfer full]
+

+

+

+

+
nm_device_wimax_get_nsp_by_path ()

+
NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
+                                                         const char *path);

+

+Gets a NMWimaxNsp by path.
+

+

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


wimax :
a NMDeviceWimax
+
path :
the object path of the NSP
Returns :
the access point or NULL if none is found. [transfer none]
+

+

+

+

+
nm_device_wimax_get_nsps ()

+
const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);

+

+Gets all the scanned NSPs of the NMDeviceWimax.
+

+

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


wimax :
a NMDeviceWimax
+
Returns :
a GPtrArray containing
+all the scanned NMWimaxNsps.
+The returned array is owned by the client and should not be modified. [element-type NMClient.WimaxNsp]
+

+

+

+

+
nm_device_wimax_get_center_frequency ()

+
guint               nm_device_wimax_get_center_frequency
+                                                        (NMDeviceWimax *self);

+

+Gets the center frequency (in KHz) of the radio channel the device is using
+to communicate with the network when connected.  Has no meaning when the
+device is not connected.
+

+

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


self :
a NMDeviceWimax
+
Returns :
the center frequency in KHz, or 0

+

+

+

+
nm_device_wimax_get_rssi ()

+
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);

+

+Gets the RSSI of the current radio link in dBm.  This value indicates how
+strong the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.
+

+

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


self :
a NMDeviceWimax
+
Returns :
the RSSI in dBm, or 0

+

+

+

+
nm_device_wimax_get_cinr ()

+
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);

+

+Gets the CINR (Carrier to Interference + Noise Ratio) of the current radio
+link in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.
+

+

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


self :
a NMDeviceWimax
+
Returns :
the CINR in dB, or 0

+

+

+

+
nm_device_wimax_get_tx_power ()

+
gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);

+

+Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.
+

+

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


self :
a NMDeviceWimax
+
Returns :
the TX power in dBm, or 0

+

+

+

+
nm_device_wimax_get_bsid ()

+
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

+

+Gets the ID of the serving Base Station when the device is connected.
+

+

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


self :
a NMDeviceWimax
+
Returns :
the ID of the serving Base Station, or NULL

+

+

+

+
Property Details

+

+
The "active-nsp" property

+
  "active-nsp"               NMWimaxNsp*           : Read

+

+The active NMWimaxNsp of the device.
+

+

+

+

+
The "bsid" property

+
  "bsid"                     gchar*                : Read

+

+The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.
+

+
Default value: NULL

+

+

+

+
The "center-frequency" property

+
  "center-frequency"         guint                 : Read

+

+The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.
+

+
Default value: 0

+

+

+

+
The "cinr" property

+
  "cinr"                     gint                  : Read

+

+CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.
+

+
Default value: 0

+

+

+

+
The "hw-address" property

+
  "hw-address"               gchar*                : Read

+

+The hardware (MAC) address of the device.
+

+
Default value: NULL

+

+

+

+
The "rssi" property

+
  "rssi"                     gint                  : Read

+

+RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.
+

+
Default value: 0

+

+

+

+
The "tx-power" property

+
  "tx-power"                 gint                  : Read

+

+Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.
+

+
Default value: 0

+

+

+

+
Signal Details

+

+
The "nsp-added" signal

+
void                user_function                      (NMDeviceWimax *self,
+                                                        GObject       *nsp,
+                                                        gpointer       user_data)      : Run First

+

+Notifies that a NMWimaxNsp is added to the wimax device.
+

+

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


self :
the wimax device that received the signal
nsp :
the new NSP
user_data :
user data set when the signal handler was connected.

+

+

+

+
The "nsp-removed" signal

+
void                user_function                      (NMDeviceWimax *self,
+                                                        GObject       *nsp,
+                                                        gpointer       user_data)      : Run First

+

+Notifies that a NMWimaxNsp is removed from the wimax device.
+

+

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


self :
the wimax device that received the signal
nsp :
the removed NSP
user_data :
user data set when the signal handler was connected.

+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMExportedConnection.html b/docs/libnm-glib/html/NMExportedConnection.html
deleted file mode 100644
index e4aa1a45..00000000
--- a/docs/libnm-glib/html/NMExportedConnection.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-NMExportedConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMExportedConnection

-
NMExportedConnection

-

-

-
Synopsis

-
                    NMExportedConnection;
-                    NMExportedConnectionClass;
-NMExportedConnection * nm_exported_connection_new       (NMConnectionScope scope);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----NMConnection
-         +----NMExportedConnection
-

-

-

-
Implemented Interfaces

-

-NMExportedConnection implements
- NMSettingsConnectionInterface.

-

-

-
Description

-

-

-

-

-
Details

-

-
NMExportedConnection

-
typedef struct _NMExportedConnection NMExportedConnection;

-

-

-

-

-

-
NMExportedConnectionClass

-
typedef struct {
-	NMConnectionClass parent;
-
-	GHashTable * (*get_settings) (NMExportedConnection *self,
-	                              GError **error);
-
-	void (*update) (NMExportedConnection *self,
-	                GHashTable *new_settings,
-	                DBusGMethodInvocation *context);
-
-	void (*delete) (NMExportedConnection *self,
-	                DBusGMethodInvocation *context);
-
-	void (*get_secrets) (NMExportedConnection *self,
-	                     const gchar *setting_name,
-	                     const gchar **hints,
-	                     gboolean request_new,
-	                     DBusGMethodInvocation *context);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMExportedConnectionClass;
-

-

-

-

-

-

-
nm_exported_connection_new ()

-
NMExportedConnection * nm_exported_connection_new       (NMConnectionScope scope);

-

-Creates a new object representing the remote connection.
-

-

--
-
-
-
-
-
-
-
-
-
-


scope :
the Connection scope (either user or system)
-
Returns :
 the new exported connection object on success, or NULL on failure
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMGsmDevice.html b/docs/libnm-glib/html/NMGsmDevice.html
deleted file mode 100644
index d6ef1e0f..00000000
--- a/docs/libnm-glib/html/NMGsmDevice.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-NMGsmDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMGsmDevice

-
NMGsmDevice

-

-

-
Synopsis

-
                    NMGsmDevice;
-                    NMGsmDeviceClass;
-NMGsmDevice *       nm_gsm_device_new                   (DBusGConnection *connection,
-                                                         const char *path);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMSerialDevice
-                     +----NMGsmDevice
-

-

-

-
Description

-

-

-

-

-
Details

-

-
NMGsmDevice

-
typedef struct _NMGsmDevice NMGsmDevice;

-

-

-

-

-

-
NMGsmDeviceClass

-
typedef struct {
-	NMSerialDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMGsmDeviceClass;
-

-

-

-

-

-

-
nm_gsm_device_new ()

-
NMGsmDevice *       nm_gsm_device_new                   (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMGsmDevice.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the DBusGConnection
-
path :
the DBus object path of the device
-
Returns :
 a new device
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index 748cce11..1990b6cb 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -5,17 +5,17 @@
 NMIP4Config
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,12 +39,11 @@
 
 
 

-

+

 
Synopsis

 
                    NMIP4Config;
                     NMIP4ConfigClass;
 #define             NM_IP4_CONFIG_ADDRESSES
-#define             NM_IP4_CONFIG_HOSTNAME
 #define             NM_IP4_CONFIG_NAMESERVERS
 #define             NM_IP4_CONFIG_DOMAINS
 #define             NM_IP4_CONFIG_ROUTES
@@ -52,14 +51,13 @@
 GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
                                                          const char *object_path);
 const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);
-const char *        nm_ip4_config_get_hostname          (NMIP4Config *config);
 const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);
 const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);
 const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);
 const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -67,32 +65,31 @@ const 
+

 
Properties

 
   "addresses"                gpointer              : Read
-  "domains"                  nm-string-array*      : Read
-  "hostname"                 gchar*                : Read
-  "nameservers"              nm-uint-array*        : Read
+  "domains"                  NMStringArray*        : Read
+  "nameservers"              NMUintArray*          : Read
   "routes"                   gpointer              : Read
-  "wins-servers"             nm-uint-array*        : Read
+  "wins-servers"             NMUintArray*          : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NMIP4Config

 
typedef struct _NMIP4Config NMIP4Config;

 

 

 

 

-

+

 
NMIP4ConfigClass

 
typedef struct {
 	NMObjectClass parent;
@@ -110,7 +107,7 @@ const 
+

 
NM_IP4_CONFIG_ADDRESSES

 
#define NM_IP4_CONFIG_ADDRESSES "addresses"
 

@@ -118,15 +115,7 @@ const 
-
NM_IP4_CONFIG_HOSTNAME

-
#define NM_IP4_CONFIG_HOSTNAME "hostname" /* DEPRECATED */
-

-

-

-

-

-

+

 
NM_IP4_CONFIG_NAMESERVERS

 
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 

@@ -134,7 +123,7 @@ const 
+

 
NM_IP4_CONFIG_DOMAINS

 
#define NM_IP4_CONFIG_DOMAINS "domains"
 

@@ -142,7 +131,7 @@ const 
+

 
NM_IP4_CONFIG_ROUTES

 
#define NM_IP4_CONFIG_ROUTES "routes"
 

@@ -150,7 +139,7 @@ const 
+

 
NM_IP4_CONFIG_WINS_SERVERS

 
#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
 

@@ -158,7 +147,7 @@ const 
+

 
nm_ip4_config_new ()

 
GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
                                                          const char *object_path);

@@ -175,19 +164,18 @@ Creates a new 
 
 
object_path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new IP4 configuration
+a new IP4 configuration. [transfer full]
 
 
 
 

 

 

-

+

 
nm_ip4_config_get_addresses ()

 
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

 

@@ -203,38 +191,15 @@ Gets the IP4 addresses (containing the address, prefix, and gateway).
 
 
 
Returns :

- the GSList containing NMSettingIP4Addresses. This is the internal copy
-used by the configuration and must not be modified.
-
-
-
-

-

-

-

-
nm_ip4_config_get_hostname ()

-
const char *        nm_ip4_config_get_hostname          (NMIP4Config *config);

-

-DEPRECATED.  Don't use.
-

-

--
-
-
-
-
-
-
-


config :
a NMIP4Config
-
Returns :
 NULL
+the GSList containing NMIP4Addresses.
+This is the internal copy used by the configuration and must not be modified. [element-type NetworkManager.IP4Address]
 
 

 
 

 

 

-

+

 
nm_ip4_config_get_nameservers ()

 
const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);

 

@@ -250,15 +215,15 @@ Gets the domain name servers (DNS).
 
 
 
Returns :

- the GArray containing guint32s. This is the internal copy used by the
-configuration and must not be modified.
+the GArray containing guint32s. This is the internal copy used by the
+configuration and must not be modified. [element-type guint32]
 
 
 
 

 

 

-

+

 
nm_ip4_config_get_domains ()

 
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

 

@@ -274,15 +239,15 @@ Gets the domain names.
 
 
 
Returns :

- the GPtrArray containing domains as strings. This is the 
-internal copy used by the configuration, and must not be modified.
+the GPtrArray containing domains as strings. This is the
+internal copy used by the configuration, and must not be modified. [element-type utf8]
 
 
 
 

 

 

-

+

 
nm_ip4_config_get_routes ()

 
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

 

@@ -298,15 +263,16 @@ Gets the routes.
 
 
 
Returns :

- the GSList containing NMSettingIP4Routes. This is the 
-internal copy used by the configuration, and must not be modified.
+the GSList containing
+NMIP4Routes. This is the internal copy used by the configuration,
+and must not be modified. [element-type NetworkManager.IP4Route]
 
 
 
 

 

 

-

+

 
nm_ip4_config_get_wins_servers ()

 
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

 

@@ -322,17 +288,17 @@ Gets the Windows Internet Name Service servers (WINS).
 
 
 
Returns :

- the GArray containing guint32s. This is the internal copy used by the
-configuration and must not be modified.
+the GArray containing guint32s.
+This is the internal copy used by the configuration and must not be modified. [element-type guint32]
 
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

 
  "addresses"                gpointer              : Read

 

@@ -340,32 +306,23 @@ The 
+

 
The "domains" property

-
  "domains"                  nm-string-array*      : Read

+
  "domains"                  NMStringArray*        : Read

 

 The GPtrArray containing domain strings of the configuration.
 

 

 

-

-
The "hostname" property

-
  "hostname"                 gchar*                : Read

-

-DEPRECATED.  Don't use.
-

-
Default value: NULL

-

-

-

+

 
The "nameservers" property

-
  "nameservers"              nm-uint-array*        : Read

+
  "nameservers"              NMUintArray*          : Read

 

 The GArray containing name servers (guint32es) of the configuration.
 

 

 

-

+

 
The "routes" property

 
  "routes"                   gpointer              : Read

 

@@ -373,9 +330,9 @@ The 
+

 
The "wins-servers" property

-
  "wins-servers"             nm-uint-array*        : Read

+
  "wins-servers"             NMUintArray*          : Read

 

 The GArray containing WINS servers (guint32es) of the configuration.
 

@@ -384,6 +341,6 @@ The 
 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 2be20459..1d2b58e1 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -5,17 +5,17 @@
 NMIP6Config
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
                    NMIP6Config;
                     NMIP6ConfigClass;
@@ -55,7 +55,7 @@ const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -63,30 +63,30 @@ const 
+

 
Properties

 
-  "addresses"                nm-ip6-address-object-array*  : Read
-  "domains"                  nm-string-array*      : Read
-  "nameservers"              nm-ip6-address-array*  : Read
-  "routes"                   nm-ip6-route-object-array*  : Read
+  "addresses"                NMIP6AddressObjectArray*  : Read
+  "domains"                  NMStringArray*        : Read
+  "nameservers"              NMIP6AddressArray*    : Read
+  "routes"                   NMIP6RouteObjectArray*  : Read
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NMIP6Config

 
typedef struct _NMIP6Config NMIP6Config;

 

 

 

 

-

+

 
NMIP6ConfigClass

 
typedef struct {
 	NMObjectClass parent;
@@ -104,7 +104,7 @@ const 
+

 
NM_IP6_CONFIG_ADDRESSES

 
#define NM_IP6_CONFIG_ADDRESSES "addresses"
 

@@ -112,7 +112,7 @@ const 
+

 
NM_IP6_CONFIG_NAMESERVERS

 
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 

@@ -120,7 +120,7 @@ const 
+

 
NM_IP6_CONFIG_DOMAINS

 
#define NM_IP6_CONFIG_DOMAINS "domains"
 

@@ -128,7 +128,7 @@ const 
+

 
NM_IP6_CONFIG_ROUTES

 
#define NM_IP6_CONFIG_ROUTES "routes"
 

@@ -136,7 +136,7 @@ const 
+

 
nm_ip6_config_new ()

 
GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
                                                          const char *object_path);

@@ -153,19 +153,18 @@ Creates a new 
 
 
object_path :

-the DBus object path of the device
-
+the DBus object path of the device
 
 
 
Returns :

- a new IP6 configuration
+a new IP6 configuration. [transfer full]
 
 
 
 

 

 

-

+

 
nm_ip6_config_get_addresses ()

 
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

 

@@ -181,15 +180,16 @@ Gets the IP6 addresses (containing the address, prefix, and gateway).
 
 
 
Returns :

- the GSList containing NMSettingIP6Addresses. This is the internal copy
-used by the configuration and must not be modified.
+the GSList containing
+NMIP6Addresses. This is the internal copy used by the configuration
+and must not be modified. [element-type NetworkManager.IP6Address]
 
 
 
 

 

 

-

+

 
nm_ip6_config_get_nameservers ()

 
const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);

 

@@ -205,16 +205,16 @@ Gets the domain name servers (DNS).
 
 
 
Returns :

- a GSList containing elements of type 'struct in6_addr' which contain
-the addresses of nameservers of the configuration.  This is the internal copy
-used by the configuration and must not be modified.
+a GSList containing elements of type
+'struct in6_addr' which contain the addresses of nameservers of the configuration.
+This is the internal copy used by the configuration and must not be modified. [element-type Posix.in6_addr]
 
 
 
 

 

 

-

+

 
nm_ip6_config_get_domains ()

 
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

 

@@ -230,15 +230,15 @@ Gets the domain names.
 
 
 
Returns :

- the GPtrArray containing domains as strings. This is the 
-internal copy used by the configuration, and must not be modified.
+the GPtrArray containing domains as strings.
+This is the internal copy used by the configuration, and must not be modified. [element-type utf8]
 
 
 
 

 

 

-

+

 
nm_ip6_config_get_routes ()

 
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

 

@@ -254,49 +254,50 @@ Gets the routes.
 
 
 
Returns :

- the GSList containing NMSettingIP6Routes. This is the 
-internal copy used by the configuration, and must not be modified.
+the GSList containing
+NMIP6Routes. This is the internal copy used by the configuration,
+and must not be modified. [element-type NetworkManager.IP6Route]
 
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

-
  "addresses"                nm-ip6-address-object-array*  : Read

+
  "addresses"                NMIP6AddressObjectArray*  : Read

 

 The GPtrArray containing the IPv6 addresses;  use
-nm_utils_ip6_addresses_from_gvalue() to return a GSList of
+nm_utils_ip6_addresses_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.
 

 

 

-

+

 
The "domains" property

-
  "domains"                  nm-string-array*      : Read

+
  "domains"                  NMStringArray*        : Read

 

 The GPtrArray containing domain strings of the configuration.
 

 

 

-

+

 
The "nameservers" property

-
  "nameservers"              nm-ip6-address-array*  : Read

+
  "nameservers"              NMIP6AddressArray*    : Read

 

 The GPtrArray containing elements of type 'struct ip6_addr' which
 contain the addresses of nameservers of the configuration.
 

 

 

-

+

 
The "routes" property

-
  "routes"                   nm-ip6-route-object-array*  : Read

+
  "routes"                   NMIP6RouteObjectArray*  : Read

 

 The GPtrArray containing the IPv6 routes;  use
-nm_utils_ip6_routes_from_gvalue() to return a GSList of
+nm_utils_ip6_routes_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.
 

 

@@ -304,6 +305,6 @@ The 
 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index d0bac52b..b0910235 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -5,17 +5,17 @@
 NMObject
 
 
-
-
+
+
 
-
+
 
 
 
 
-
-
+
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,7 +39,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_OBJECT_DBUS_CONNECTION
 #define             NM_OBJECT_DBUS_PATH
@@ -49,13 +49,14 @@
 const char *        nm_object_get_path                  (NMObject *object);
 

 

-

+

 
Object Hierarchy

 
   GObject
    +----NMObject
          +----NMClient
          +----NMDevice
+         +----NMWimaxNsp
          +----NMAccessPoint
          +----NMIP4Config
          +----NMIP6Config
@@ -64,21 +65,21 @@ const char *        NMDHCP6Config
 

 

-

+

 
Properties

 
   "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only
   "dbus-path"                gchar*                : Read / Write / Construct Only
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

@@ -86,7 +87,7 @@ const char *        
+

 
NM_OBJECT_DBUS_PATH

 
#define NM_OBJECT_DBUS_PATH "dbus-path"
 

@@ -94,14 +95,14 @@ const char *        
+

 
NMObject

 
typedef struct _NMObject NMObject;

 

 

 

 

-

+

 
NMObjectClass

 
typedef struct {
 	GObjectClass parent;
@@ -119,7 +120,7 @@ const char *        
+

 
nm_object_get_connection ()

 
DBusGConnection *   nm_object_get_connection            (NMObject *object);

 

@@ -135,14 +136,14 @@ Gets the Returns :

- the connection
+the connection. [transfer none]
 
 
 
 

 

 

-

+

 
nm_object_get_path ()

 
const char *        nm_object_get_path                  (NMObject *object);

 

@@ -158,23 +159,22 @@ Gets the DBus path of the 
 
 
 
Returns :

- the object's path. This is the internal string used by the
-device, and must not be modified.
-
+the object's path. This is the internal string used by the
+device, and must not be modified.
 
 
 

 

 

-

+

 
Property Details

-

+

 
The "dbus-connection" property

 
  "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only

 
Connection.

 

 

-

+

 
The "dbus-path" property

 
  "dbus-path"                gchar*                : Read / Write / Construct Only

 
DBus Object Path.

@@ -184,6 +184,6 @@ device, and must not be modified.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index adf04941..07e3564b 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -5,17 +5,17 @@
 NMRemoteConnection
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -27,12 +27,12 @@
                    | 
                   Object Hierarchy
                    | 
-                  Implemented Interfaces
-                   | 
                   Properties
+                   | 
+                  Signals
-

+

 

 

 
@@ -41,55 +41,100 @@
 
 
 

-

+

 
Synopsis

-
                    NMRemoteConnection;
+
#define             NM_REMOTE_CONNECTION_UPDATED
+#define             NM_REMOTE_CONNECTION_REMOVED
+                    NMRemoteConnection;
                     NMRemoteConnectionClass;
+void                (*NMRemoteConnectionCommitFunc)     (NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMRemoteConnectionDeleteFunc)     (NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
+                                                         GHashTable *secrets,
+                                                         GError *error,
+                                                         gpointer user_data);
 NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         NMConnectionScope scope,
                                                          const char *path);
+void                nm_remote_connection_commit_changes (NMRemoteConnection *connection,
+                                                         NMRemoteConnectionCommitFunc callback,
+                                                         gpointer user_data);
+void                nm_remote_connection_delete         (NMRemoteConnection *connection,
+                                                         NMRemoteConnectionDeleteFunc callback,
+                                                         gpointer user_data);
+void                nm_remote_connection_get_secrets    (NMRemoteConnection *connection,
+                                                         const char *setting_name,
+                                                         NMRemoteConnectionGetSecretsFunc callback,
+                                                         gpointer user_data);
 

 

-

+

 
Object Hierarchy

 
   GObject
-   +----NMConnection
+   +----NMConnection
          +----NMRemoteConnection
 

 

-

-
Implemented Interfaces

-

-NMRemoteConnection implements
- NMSettingsConnectionInterface.

-

-

+

 
Properties

 
   "bus"                      DBusGConnection*      : Write / Construct Only
   "init-result"              guint                 : Read
 

 

-

+

+
Signals

+
+  "removed"                                        : Run First
+  "updated"                                        : Run First
+  "visible"                                        : Run First
+

+

+

 
Description

 

 

 

-

+

 
Details

-

+

+
NM_REMOTE_CONNECTION_UPDATED

+
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
+

+

+

+

+

+

+
NM_REMOTE_CONNECTION_REMOVED

+
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+

+

+

+

+

+

 
NMRemoteConnection

 
typedef struct _NMRemoteConnection NMRemoteConnection;

 

 

 

 

-

+

 
NMRemoteConnectionClass

 
typedef struct {
 	NMConnectionClass parent_class;
 
+	/* Signals */
+	void (*updated) (NMRemoteConnection *connection,
+	                 GHashTable *new_settings);
+
+	void (*removed) (NMRemoteConnection *connection);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -103,10 +148,37 @@ NMRemoteConnection implements
 

 

 

-

+

+
NMRemoteConnectionCommitFunc ()

+
void                (*NMRemoteConnectionCommitFunc)     (NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMRemoteConnectionDeleteFunc ()

+
void                (*NMRemoteConnectionDeleteFunc)     (NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMRemoteConnectionGetSecretsFunc ()

+
void                (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
+                                                         GHashTable *secrets,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

 
nm_remote_connection_new ()

 
NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         NMConnectionScope scope,
                                                          const char *path);

 

 Creates a new object representing the remote connection.
@@ -116,38 +188,125 @@ Creates a new object representing the remote connection.
 
 
 
bus :

-a valid and connected D-Bus connection
+a valid and connected D-Bus connection
+
+
+
path :

+the D-Bus path of the connection as exported by the settings service
+
+
+
Returns :

+the new remote connection object on success, or NULL on failure
+
+
+

+

+

+

+
nm_remote_connection_commit_changes ()

+
void                nm_remote_connection_commit_changes (NMRemoteConnection *connection,
+                                                         NMRemoteConnectionCommitFunc callback,
+                                                         gpointer user_data);

+

+Save any local changes to the settings and properties of this connection and
+save them in the settings service.
+

+

++
+
+
+
-
-
+
-
-
+
+
+


connection :
the NMRemoteConnection
 
 

 
scope :
the Connection scope (either user or system)
+
callback :
a function to be called when the commit completes. [scope async]
 
 

 
path :
the D-Bus path of the connection as exported by the settings service
- indicated by scope
+
user_data :
caller-specific data to be passed to callback
 
 

+

+

+

+
nm_remote_connection_delete ()

+
void                nm_remote_connection_delete         (NMRemoteConnection *connection,
+                                                         NMRemoteConnectionDeleteFunc callback,
+                                                         gpointer user_data);

+

+Delete the connection.
+

+

++
-
-
+
+
+
+
+
+
+
+
+
+
+
+


 
Returns :
 the new remote connection object on success, or NULL on failure
+
connection :
the NMRemoteConnection
+
callback :
a function to be called when the delete completes. [scope async][allow-none]
+
user_data :
caller-specific data to be passed to callback
+

+

+

+

+
nm_remote_connection_get_secrets ()

+
void                nm_remote_connection_get_secrets    (NMRemoteConnection *connection,
+                                                         const char *setting_name,
+                                                         NMRemoteConnectionGetSecretsFunc callback,
+                                                         gpointer user_data);

+

+Request the connection's secrets.
+

+

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


connection :
the NMRemoteConnection
+
setting_name :
the NMSetting object name to get secrets for
callback :
a function to be called when the update completes. [scope async]
+
user_data :
caller-specific data to be passed to callback
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "bus" property

 
  "bus"                      DBusGConnection*      : Write / Construct Only

 
DBusGConnection.

 

 

-

+

 
The "init-result" property

 
  "init-result"              guint                 : Read

 
Initialization result (PRIVATE).

@@ -155,9 +314,81 @@ Creates a new object representing the remote connection.
 
Default value: 0

 

 

+

+
Signal Details

+

+
The "removed" signal

+
void                user_function                      (NMRemoteConnection *connection,
+                                                        gpointer            user_data)       : Run First

+

+This signal is emitted when a connection is either deleted or becomes
+invisible to the current user.
+

+

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


connection :
a NMConnection
+
user_data :
user data set when the signal handler was connected.

+

+

+

+
The "updated" signal

+
void                user_function                      (NMRemoteConnection *connection,
+                                                        gpointer            user_data)       : Run First

+

+This signal is emitted when a connection changes, and it is
+still visible to the user.
+

+

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


connection :
a NMConnection
+
user_data :
user data set when the signal handler was connected.

+

+

+

+
The "visible" signal

+
void                user_function                      (NMRemoteConnection *nmremoteconnection,
+                                                        gboolean            arg1,
+                                                        gpointer            user_data)               : Run First

+

+

+

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


nmremoteconnection :
the object which received the signal.
user_data :
user data set when the signal handler was connected.

+

+

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 259a5b3d..b3741ef3 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -5,20 +5,20 @@
 NMRemoteSettings
 
 
-
+
 
-
-
+
+
 
 
 
 
-
+
-
+
-

+

 

 

 
@@ -41,62 +41,152 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_REMOTE_SETTINGS_BUS
-#define             NM_REMOTE_SETTINGS_SCOPE
+
enum                NMRemoteSettingsError;
+#define             NM_TYPE_REMOTE_SETTINGS_ERROR
+#define             NM_REMOTE_SETTINGS_ERROR
+GQuark              nm_remote_settings_error_quark      (void);
+#define             NM_REMOTE_SETTINGS_BUS
 #define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
-                    NMRemoteSettings;
-                    NMRemoteSettingsClass;
-NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus,
-                                                         NMConnectionScope scope);
+#define             NM_REMOTE_SETTINGS_HOSTNAME
+#define             NM_REMOTE_SETTINGS_CAN_MODIFY
+#define             NM_REMOTE_SETTINGS_NEW_CONNECTION
+#define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
+void                (*NMRemoteSettingsAddConnectionFunc)
+                                                        (NMRemoteSettings *settings,
+                                                         NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
+                                                         GError *error,
+                                                         gpointer user_data);
+struct              NMRemoteSettings;
+struct              NMRemoteSettingsClass;
+GType               nm_remote_settings_get_type         (void);
+NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
+GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
+NMRemoteConnection *  nm_remote_settings_get_connection_by_path
+                                                        (NMRemoteSettings *settings,
+                                                         const char *path);
+NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
+                                                        (NMRemoteSettings *settings,
+                                                         const char *uuid);
+gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
+                                                         NMConnection *connection,
+                                                         NMRemoteSettingsAddConnectionFunc callback,
+                                                         gpointer user_data);
+gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
+                                                         const char *hostname,
+                                                         NMRemoteSettingsSaveHostnameFunc callback,
+                                                         gpointer user_data);
 

 

-

+

 
Object Hierarchy

 
   GObject
    +----NMRemoteSettings
 

 

-

-
Implemented Interfaces

-

-NMRemoteSettings implements
- NMSettingsInterface.

-

-

+

 
Properties

 
   "bus"                      DBusGConnection*      : Read / Write / Construct Only
-  "scope"                    guint                 : Read / Write / Construct Only
+  "can-modify"               gboolean              : Read
+  "hostname"                 gchar*                : Read
   "service-running"          gboolean              : Read
 

 

-

+

+
Signals

+
+  "connections-read"                               : Run First
+  "new-connection"                                 : Run First
+

+

+

 
Description

 

 

 

-

+

 
Details

-

-
NM_REMOTE_SETTINGS_BUS

-
#define NM_REMOTE_SETTINGS_BUS "bus"
+

+
enum NMRemoteSettingsError

+
typedef enum {
+	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
+} NMRemoteSettingsError;
 

 

+Describes errors that may result from operations involving a NMRemoteSettings.
 

+

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


NM_REMOTE_SETTINGS_ERROR_UNKNOWN
unknown or unclassified error
+
NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED
the NMRemoteConnection object
+  was removed before it was completely initialized
+
NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE
the NMRemoteConnection object
+  is not visible or otherwise unreadable
+

 

 

-

-
NM_REMOTE_SETTINGS_SCOPE

-
#define NM_REMOTE_SETTINGS_SCOPE "scope"
+

+
NM_TYPE_REMOTE_SETTINGS_ERROR

+
#define NM_TYPE_REMOTE_SETTINGS_ERROR (nm_remote_settings_error_get_type ()) 
 

 

 

 

 

-

+

+
NM_REMOTE_SETTINGS_ERROR

+
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+

+

+

+

+

+

+
nm_remote_settings_error_quark ()

+
GQuark              nm_remote_settings_error_quark      (void);

+

+Registers an error quark for NMRemoteSettings if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMRemoteSettings errors.

+

+

+

+
NM_REMOTE_SETTINGS_BUS

+
#define NM_REMOTE_SETTINGS_BUS             "bus"
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_SERVICE_RUNNING

 
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
 

@@ -104,18 +194,76 @@ NMRemoteSettings implements
 

 

 

-

-
NMRemoteSettings

-
typedef struct _NMRemoteSettings NMRemoteSettings;

+

+
NM_REMOTE_SETTINGS_HOSTNAME

+
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+

+

+

+

+

+

+
NM_REMOTE_SETTINGS_CAN_MODIFY

+
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
+

+

+

+

+

+

+
NM_REMOTE_SETTINGS_NEW_CONNECTION

+
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
+

 

 

 

 

-

-
NMRemoteSettingsClass

-
typedef struct {
+

+
NM_REMOTE_SETTINGS_CONNECTIONS_READ

+
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
+

+

+

+

+

+

+
NMRemoteSettingsAddConnectionFunc ()

+
void                (*NMRemoteSettingsAddConnectionFunc)
+                                                        (NMRemoteSettings *settings,
+                                                         NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMRemoteSettingsSaveHostnameFunc ()

+
void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
struct NMRemoteSettings

+
struct NMRemoteSettings;

+

+

+

+

+

+
struct NMRemoteSettingsClass

+
struct NMRemoteSettingsClass {
 	GObjectClass parent;
 
+	/* Signals */
+	void (*new_connection) (NMRemoteSettings *settings,
+	                        NMRemoteConnection *connection);
+
+	void (*connections_read) (NMRemoteSettings *settings);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -123,16 +271,22 @@ NMRemoteSettings implements
 	void (*_reserved4) (void);
 	void (*_reserved5) (void);
 	void (*_reserved6) (void);
-} NMRemoteSettingsClass;
+};
 

 

 

 

 

-

+

+
nm_remote_settings_get_type ()

+
GType               nm_remote_settings_get_type         (void);

+

+

+

+

+

 
nm_remote_settings_new ()

-
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus,
-                                                         NMConnectionScope scope);

+
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

 

 Creates a new object representing the remote settings service.
 

@@ -141,49 +295,261 @@ Creates a new object representing the remote settings service.
 
 
 
bus :

-a valid and connected D-Bus connection
+a valid and connected D-Bus connection. [allow-none]
+
+
+
+
Returns :

+the new remote settings object on success, or NULL on failure
+
+
+

+

+

+

+
nm_remote_settings_list_connections ()

+
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

+

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


settings :
the NMRemoteSettings
+
Returns :
a
+list containing all connections provided by the remote settings service.
+Each element of the returned list is a NMRemoteConnection instance, which is
+owned by the NMRemoteSettings object and should not be freed by the caller.
+The returned list is, however, owned by the caller and should be freed
+using g_slist_free() when no longer required. [transfer container][element-type NMClient.RemoteConnection]
+

+

+

+

+
nm_remote_settings_get_connection_by_path ()

+
NMRemoteConnection *  nm_remote_settings_get_connection_by_path
+                                                        (NMRemoteSettings *settings,
+                                                         const char *path);

+

+Returns the NMRemoteConnection representing the connection at path.
+

+

++
+
+
+
-
-
+
+
+
+
+
+
+


settings :
the NMRemoteSettings
 
 

 
scope :
the settings service scope (either user or system)
+
path :
the D-Bus object path of the remote connection
Returns :
the remote connection object on success, or NULL if the object was
+not known. [transfer none]
 
 

+

+

+

+
nm_remote_settings_get_connection_by_uuid ()

+
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
+                                                        (NMRemoteSettings *settings,
+                                                         const char *uuid);

+

+Returns the NMRemoteConnection identified by uuid.
+

+

++
+
+
+
+
+
+
+
+
-
+
+
+


settings :
the NMRemoteSettings
+
uuid :
the UUID of the remote connection

 

 
Returns :
 the new remote settings object on success, or NULL on failure
+the remote connection object on success, or NULL if the object was
+not known. [transfer none]
+

+

+

+

+
nm_remote_settings_add_connection ()

+
gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
+                                                         NMConnection *connection,
+                                                         NMRemoteSettingsAddConnectionFunc callback,
+                                                         gpointer user_data);

+

+Requests that the remote settings service add the given settings to a new
+connection.
+

+

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


settings :
the NMRemoteSettings
+
connection :
the connection to add. Note that this object's settings will be
+added, not the object itself
callback :
callback to be called when the add operation completes. [scope async]
+
user_data :
caller-specific data passed to callback
+
Returns :
TRUE if the request was successful, FALSE if it failed

+

+

+

+
nm_remote_settings_save_hostname ()

+
gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
+                                                         const char *hostname,
+                                                         NMRemoteSettingsSaveHostnameFunc callback,
+                                                         gpointer user_data);

+

+Requests that the machine's persistent hostname be set to the specified value
+or cleared.
+

+

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


settings :
the NMRemoteSettings
 
 
hostname :
the new persistent hostname to set, or NULL to clear any existing
+persistent hostname
callback :
callback to be called when the hostname operation completes. [scope async]
+
user_data :
caller-specific data passed to callback
+
Returns :
TRUE if the request was successful, FALSE if it failed

 
 

 

 

-

+

 
Property Details

-

+

 
The "bus" property

 
  "bus"                      DBusGConnection*      : Read / Write / Construct Only

 
DBusGConnection.

 

 

-

-
The "scope" property

-
  "scope"                    guint                 : Read / Write / Construct Only

-
NMConnection scope.

-
Allowed values: <= 2

-
Default value: 2

+

+
The "can-modify" property

+
  "can-modify"               gboolean              : Read

+
Can modify anything (hostname, connections, etc).

+
Default value: FALSE

+

+

+

+
The "hostname" property

+
  "hostname"                 gchar*                : Read

+
Persistent hostname.

+
Default value: NULL

 

 

-

+

 
The "service-running" property

 
  "service-running"          gboolean              : Read

 
Is service running.

 
Default value: FALSE

 

 

+

+
Signal Details

+

+
The "connections-read" signal

+
void                user_function                      (NMRemoteSettings *nmremotesettings,
+                                                        gpointer          user_data)             : Run First

+

+

+

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


nmremotesettings :
the object which received the signal.
user_data :
user data set when the signal handler was connected.

+

+

+

+
The "new-connection" signal

+
void                user_function                      (NMRemoteSettings *nmremotesettings,
+                                                        GObject          *arg1,
+                                                        gpointer          user_data)             : Run First

+

+

+

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


nmremotesettings :
the object which received the signal.
user_data :
user data set when the signal handler was connected.

+

+

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
new file mode 100644
index 00000000..8da09f9c
--- /dev/null
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -0,0 +1,593 @@
+
+
+
+
+NMSecretAgent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSecretAgent

+
NMSecretAgent

+

+

+
Synopsis

+
#define             NM_SECRET_AGENT_ERROR
+#define             NM_TYPE_SECRET_AGENT_ERROR
+GQuark              nm_secret_agent_error_quark         (void);
+enum                NMSecretAgentError;
+enum                NMSecretAgentGetSecretsFlags;
+#define             NM_SECRET_AGENT_IDENTIFIER
+#define             NM_SECRET_AGENT_AUTO_REGISTER
+#define             NM_SECRET_AGENT_REGISTRATION_RESULT
+                    NMSecretAgent;
+void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GHashTable *secrets,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMSecretAgentSaveSecretsFunc)     (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+                    NMSecretAgentClass;
+GType               nm_secret_agent_get_type            (void);
+gboolean            nm_secret_agent_register            (NMSecretAgent *self);
+gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
+void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         const char *setting_name,
+                                                         const char **hints,
+                                                         NMSecretAgentGetSecretsFlags flags,
+                                                         NMSecretAgentGetSecretsFunc callback,
+                                                         gpointer callback_data);
+void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentSaveSecretsFunc callback,
+                                                         gpointer callback_data);
+void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer callback_data);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSecretAgent
+

+

+

+
Properties

+
+  "auto-register"            gboolean              : Read / Write / Construct
+  "identifier"               gchar*                : Read / Write / Construct Only
+

+

+

+
Signals

+
+  "registration-result"                            : Run First
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NM_SECRET_AGENT_ERROR

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
+

+

+

+

+

+

+
NM_TYPE_SECRET_AGENT_ERROR

+
#define NM_TYPE_SECRET_AGENT_ERROR    (nm_secret_agent_error_get_type ())
+

+

+

+

+

+

+
nm_secret_agent_error_quark ()

+
GQuark              nm_secret_agent_error_quark         (void);

+

+

+

+

+

+
enum NMSecretAgentError

+
typedef enum {
+	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0,
+	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
+	NM_SECRET_AGENT_ERROR_USER_CANCELED,
+	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
+	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+	NM_SECRET_AGENT_ERROR_NO_SECRETS,
+} NMSecretAgentError;
+

+

+

+

+

+

+
enum NMSecretAgentGetSecretsFlags

+
typedef enum {
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2
+} NMSecretAgentGetSecretsFlags;
+

+

+NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
+

+

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


NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE
no special behavior; by default no
+user interaction is allowed and requests for secrets are fulfilled from
+persistent storage, or if no secrets are available an error is returned.
+
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
allows the request to
+interact with the user, possibly prompting via UI for secrets if any are
+required, or if none are found in persistent storage.
+
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW
explicitly prompt for new
+secrets from the user.  This flag signals that NetworkManager thinks any
+existing secrets are invalid or wrong.  This flag implies that interaction
+is allowed.
+

+

+

+

+
NM_SECRET_AGENT_IDENTIFIER

+
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
+

+

+

+

+

+

+
NM_SECRET_AGENT_AUTO_REGISTER

+
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
+

+

+

+

+

+

+
NM_SECRET_AGENT_REGISTRATION_RESULT

+
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+

+

+

+

+

+

+
NMSecretAgent

+
typedef struct _NMSecretAgent NMSecretAgent;

+

+

+

+

+

+
NMSecretAgentGetSecretsFunc ()

+
void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GHashTable *secrets,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMSecretAgentSaveSecretsFunc ()

+
void                (*NMSecretAgentSaveSecretsFunc)     (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMSecretAgentDeleteSecretsFunc ()

+
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

+
NMSecretAgentClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual methods for subclasses */
+
+	/* Called when the subclass should retrieve and return secrets.  Subclass
+	 * must copy or reference any arguments it may require after returning from
+	 * this method, as the arguments will freed (except for 'agent', 'callback',
+	 * and 'callback_data' of course).  If the request is canceled, the callback
+	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error.
+	 */
+	void (*get_secrets) (NMSecretAgent *agent,
+	                     NMConnection *connection,
+	                     const char *connection_path,
+	                     const char *setting_name,
+	                     const char **hints,
+	                     NMSecretAgentGetSecretsFlags flags,
+	                     NMSecretAgentGetSecretsFunc callback,
+	                     gpointer callback_data);
+
+	/* Called when the subclass should cancel an outstanding request to
+	 * get secrets for a given connection.  Canceling the request MUST
+	 * call the callback that was passed along with the initial get_secrets
+	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error to that callback.
+	 */
+	void (*cancel_get_secrets) (NMSecretAgent *agent,
+	                            const char *connection_path,
+	                            const char *setting_name);
+
+	/* Called when the subclass should save the secrets contained in the
+	 * connection to backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'callback_data'
+	 * of course).
+	 */
+	void (*save_secrets) (NMSecretAgent *agent,
+	                      NMConnection *connection,
+	                      const char *connection_path,
+	                      NMSecretAgentSaveSecretsFunc callback,
+	                      gpointer callback_data);
+
+	/* Called when the subclass should delete the secrets contained in the
+	 * connection from backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'callback_data'
+	 * of course).
+	 */
+	void (*delete_secrets) (NMSecretAgent *agent,
+	                        NMConnection *connection,
+	                        const char *connection_path,
+	                        NMSecretAgentDeleteSecretsFunc callback,
+	                        gpointer callback_data);
+
+	/* Signals */
+	void (*registration_result) (NMSecretAgent *agent, GError *error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMSecretAgentClass;
+

+

+

+

+

+

+
nm_secret_agent_get_type ()

+
GType               nm_secret_agent_get_type            (void);

+

+

+

+

+

+
nm_secret_agent_register ()

+
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

+

+Registers the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is able to provide and save
+secrets for connections on behalf of its user.  Registration is an
+asynchronous operation and its success or failure is indicated via the
+'registration-result' signal.
+

+

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


self :
a NMSecretAgent
+
Returns :
a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
+successfully requested.

+

+

+

+
nm_secret_agent_unregister ()

+
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

+

+Unregisters the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is will no longer provide or
+store secrets on behalf of this user.
+

+

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


self :
a NMSecretAgent
+
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.

+

+

+

+
nm_secret_agent_get_secrets ()

+
void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         const char *setting_name,
+                                                         const char **hints,
+                                                         NMSecretAgentGetSecretsFlags flags,
+                                                         NMSecretAgentGetSecretsFunc callback,
+                                                         gpointer callback_data);

+

+Asyncronously retrieve secrets belonging to connection for the
+setting setting_name.  flags indicate specific behavior that the secret
+agent should use when performing the request, for example returning only
+existing secrets without user interaction, or requesting entirely new
+secrets from the user.
+

+

+VFunc: get_secrets
+

+

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


self :
a NMSecretAgent
+
connection :
the NMConnection for which we're asked secrets
setting_name :
the name of the secret setting
hints :
hints to the agent. [array zero-terminated=1]
+
flags :
flags that modify the behavior of the request
callback :
a callback, invoked when the operation is done. [scope async]
+
callback_data :
. [closure]
+

+

+

+

+
nm_secret_agent_save_secrets ()

+
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentSaveSecretsFunc callback,
+                                                         gpointer callback_data);

+

+Asyncronously ensure that all secrets inside connection
+are stored to disk.
+

+

+VFunc: save_secrets
+

+

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


self :
a NMSecretAgent
+
connection :
a NMConnection
+
callback :
a callback, invoked when the operation is done. [scope async]
+
callback_data :
. [closure]
+

+

+

+

+
nm_secret_agent_delete_secrets ()

+
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer callback_data);

+

+Asynchronously ask the agent to delete all saved secrets belonging to
+connection.
+

+

+VFunc: delete_secrets
+

+

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


self :
a NMSecretAgent
+
connection :
a NMConnection
+
callback :
a callback, invoked when the operation is done. [scope async]
+
callback_data :
. [closure]
+

+

+

+

+
Property Details

+

+
The "auto-register" property

+
  "auto-register"            gboolean              : Read / Write / Construct

+

+If TRUE, the agent will attempt to automatically register itself after
+it is created (via an idle handler) and to re-register itself if
+NetworkManager restarts.  If FALSE, the agent does not automatically
+register with NetworkManager, and nm_secret_agent_register() must be
+called.  If 'auto-register' is TRUE, calling nm_secret_agent_unregister()
+will suppress auto-registration until nm_secret_agent_register() is
+called, which re-enables auto-registration.
+

+
Default value: TRUE

+

+

+

+
The "identifier" property

+
  "identifier"               gchar*                : Read / Write / Construct Only

+

+Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).
+

+
Default value: NULL

+

+

+

+
Signal Details

+

+
The "registration-result" signal

+
void                user_function                      (NMSecretAgent *agent,
+                                                        gpointer       error,
+                                                        gpointer       user_data)      : Run First

+

+Indicates the result of a registration request; if error is NULL the
+request was successful.
+

+

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


agent :
the agent that received the signal
error :
the error, if any, that occured while registering
user_data :
user data set when the signal handler was connected.

+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSerialDevice.html b/docs/libnm-glib/html/NMSerialDevice.html
deleted file mode 100644
index 3d968eb1..00000000
--- a/docs/libnm-glib/html/NMSerialDevice.html
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-NMSerialDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMSerialDevice

-
NMSerialDevice

-

-

-
Synopsis

-
                    NMSerialDevice;
-                    NMSerialDeviceClass;
-guint32             nm_serial_device_get_bytes_received (NMSerialDevice *self);
-guint32             nm_serial_device_get_bytes_sent     (NMSerialDevice *self);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMSerialDevice
-                     +----NMCdmaDevice
-                     +----NMGsmDevice
-

-

-

-
Signals

-
-  "ppp-stats"                                      : Run First
-

-

-

-
Description

-

-

-

-

-
Details

-

-
NMSerialDevice

-
typedef struct _NMSerialDevice NMSerialDevice;

-

-

-

-

-

-
NMSerialDeviceClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*ppp_stats) (NMSerialDevice *self, guint32 in_bytes, guint32 out_bytes);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSerialDeviceClass;
-

-

-

-

-

-

-
nm_serial_device_get_bytes_received ()

-
guint32             nm_serial_device_get_bytes_received (NMSerialDevice *self);

-

-Gets the amount of bytes received by the serial device.
-This counter is reset when the device is activated.
-

-

--
-
-
-
-
-
-
-
-
-
-


self :
a NMSerialDevice
-
Returns :
 bytes received
-

-

-

-

-
nm_serial_device_get_bytes_sent ()

-
guint32             nm_serial_device_get_bytes_sent     (NMSerialDevice *self);

-

-Gets the amount of bytes sent by the serial device.
-This counter is reset when the device is activated.
-

-

--
-
-
-
-
-
-
-
-
-
-


self :
a NMSerialDevice
-
Returns :
 bytes sent
-

-

-

-

-
Signal Details

-

-
The "ppp-stats" signal

-
void                user_function                      (NMSerialDevice *device,
-                                                        guint           in_bytes,
-                                                        guint           out_bytes,
-                                                        gpointer        user_data)      : Run First

-

-Notifies that a NMAccessPoint is added to the wifi device.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


device :
the serial device that received the signal
-
in_bytes :
the amount of bytes received
-
out_bytes :
the amount of bytes sent
-
user_data :
user data set when the signal handler was connected.

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index ed46f644..3f547734 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -5,17 +5,17 @@
 NMVPNConnection
 
 
-
-
+
+
 
-
+
 
 
 
 
-
-
+
+
@@ -32,7 +32,7 @@
                   Signals
-

+

 

 

 
@@ -41,19 +41,19 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_VPN_CONNECTION_VPN_STATE
 #define             NM_VPN_CONNECTION_BANNER
                     NMVPNConnection;
                     NMVPNConnectionClass;
-GObject *           nm_vpn_connection_new               (DBusGConnection *dbus_connection,
+GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
                                                          const char *path);
 NMVPNConnectionState  nm_vpn_connection_get_vpn_state   (NMVPNConnection *vpn);
-const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
+const char *           nm_vpn_connection_get_banner     (NMVPNConnection *vpn);
 

 

-

+

 
Object Hierarchy

 
   GObject
@@ -62,27 +62,27 @@ const char *        
+

 
Properties

 
   "banner"                   gchar*                : Read
   "vpn-state"                guint                 : Read
 

 

-

+

 
Signals

 
-  "vpn-state-changed"                              : Run First
+  "vpn-state-changed"                              : Run First
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_VPN_CONNECTION_VPN_STATE

 
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 

@@ -90,7 +90,7 @@ const char *        
+

 
NM_VPN_CONNECTION_BANNER

 
#define NM_VPN_CONNECTION_BANNER "banner"
 

@@ -98,14 +98,14 @@ const char *        
+

 
NMVPNConnection

 
typedef struct _NMVPNConnection NMVPNConnection;

 

 

 

 

-

+

 
NMVPNConnectionClass

 
typedef struct {
 	NMActiveConnectionClass parent;
@@ -128,81 +128,51 @@ const char *        
+

 
nm_vpn_connection_new ()

-
GObject *           nm_vpn_connection_new               (DBusGConnection *dbus_connection,
+
GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
                                                          const char *path);

 

+Creates a new NMVPNConnection.
 

 

-
-
+
-
+
-

 
 
 
dbus_connection :

+
connection :
the DBusGConnection
 
 

 

 
path :

-the DBus object path of the new connection
 

 

 
Returns :

+a new connection object. [transfer full]
 
 

 
 

 

 

-

+

 
nm_vpn_connection_get_vpn_state ()

 
NMVPNConnectionState  nm_vpn_connection_get_vpn_state   (NMVPNConnection *vpn);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


vpn :

-
Returns :

-

 

 

-

+

 
nm_vpn_connection_get_banner ()

-
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

+
const char *           nm_vpn_connection_get_banner     (NMVPNConnection *vpn);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


vpn :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "banner" property

 
  "banner"                   gchar*                : Read

 

@@ -211,7 +181,7 @@ The VPN login banner of the active VPN connection.
 
Default value: NULL

 

 

-

+

 
The "vpn-state" property

 
  "vpn-state"                guint                 : Read

 

@@ -221,14 +191,14 @@ The VPN state of the active VPN connection.
 
Default value: 0

 

 

-

+

 
Signal Details

-

+

 
The "vpn-state-changed" signal

 
void                user_function                      (NMVPNConnection *nmvpnconnection,
                                                         guint            arg1,
                                                         guint            arg2,
-                                                        gpointer         user_data)            : Run First

+                                                        gpointer         user_data)            : Run First

 

 

 

@@ -236,18 +206,7 @@ The VPN state of the active VPN connection.
 
-
-
-
-
-
-
-
-
-
+
@@ -260,6 +219,6 @@ The VPN state of the active VPN connection.
 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
new file mode 100644
index 00000000..10f11410
--- /dev/null
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -0,0 +1,318 @@
+
+
+
+
+NMWimaxNsp
+
+
+
+
+
+
+
+
+
+

 

 
nmvpnconnection :
the object which received the signal.
-
arg1 :

-
arg2 :

-the object which received the signal.
 

 

 
user_data :

 
 
 

+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMWimaxNsp

+
NMWimaxNsp

+

+

+
Synopsis

+
#define             NM_WIMAX_NSP_NAME
+#define             NM_WIMAX_NSP_SIGNAL_QUALITY
+#define             NM_WIMAX_NSP_NETWORK_TYPE
+enum                NMWimaxNspNetworkType;
+                    NMWimaxNsp;
+                    NMWimaxNspClass;
+GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
+                                                         const char *path);
+const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
+guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+NMWimaxNspNetworkType  nm_wimax_nsp_get_network_type    (NMWimaxNsp *nsp);
+GSList *                nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
+                                                         const GSList *connections);
+gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMWimaxNsp
+

+

+

+
Properties

+
+  "name"                     gchar*                : Read
+  "network-type"             guint                 : Read
+  "signal-quality"           guint                 : Read
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NM_WIMAX_NSP_NAME

+
#define NM_WIMAX_NSP_NAME           "name"
+

+

+

+

+

+

+
NM_WIMAX_NSP_SIGNAL_QUALITY

+
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+

+

+

+

+

+

+
NM_WIMAX_NSP_NETWORK_TYPE

+
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
+

+

+

+

+

+

+
enum NMWimaxNspNetworkType

+
typedef enum {
+	NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN         = 0,
+	NM_WIMAX_NSP_NETWORK_TYPE_HOME            = 1,
+	NM_WIMAX_NSP_NETWORK_TYPE_PARTNER         = 2,
+	NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
+} NMWimaxNspNetworkType;
+

+

+

+

+

+

+
NMWimaxNsp

+
typedef struct _NMWimaxNsp NMWimaxNsp;

+

+

+

+

+

+
NMWimaxNspClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMWimaxNspClass;
+

+

+

+

+

+

+
nm_wimax_nsp_new ()

+
GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMWimaxNsp.
+

+

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


connection :
the DBusGConnection
+
path :
the D-Bus object path of the WiMAX NSP
Returns :
a new WiMAX NSP. [transfer full]
+

+

+

+

+
nm_wimax_nsp_get_name ()

+
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);

+

+Gets the name of the wimax NSP
+

+

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


nsp :
a NMWimaxNsp
+
Returns :
the name

+

+

+

+
nm_wimax_nsp_get_signal_quality ()

+
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

+

+Gets the WPA signal quality of the wimax NSP.
+

+

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


nsp :
a NMWimaxNsp
+
Returns :
the signal quality

+

+

+

+
nm_wimax_nsp_get_network_type ()

+
NMWimaxNspNetworkType  nm_wimax_nsp_get_network_type    (NMWimaxNsp *nsp);

+

+Gets the network type of the wimax NSP.
+

+

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


nsp :
a NMWimaxNsp
+
Returns :
the network type

+

+

+

+
nm_wimax_nsp_filter_connections ()

+
GSList *                nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
+                                                         const GSList *connections);

+

+Filters a given list of connections for a given NMWimaxNsp object and
+return connections which may be activated with the access point.  Any
+returned connections will match the nsp's network name and other attributes.
+

+

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


nsp :
an NMWimaxNsp to filter connections for
connections :
a list of
+NMConnection objects to filter. [element-type NetworkManager.Connection]
+
Returns :
a
+list of NMConnection objects that could be activated with the given nsp.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
+

+

+

+

+
nm_wimax_nsp_connection_valid ()

+
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);

+

+

+

+

+

+
Property Details

+

+
The "name" property

+
  "name"                     gchar*                : Read

+

+The name of the WiMAX NSP.
+

+
Default value: NULL

+

+

+

+
The "network-type" property

+
  "network-type"             guint                 : Read

+

+The network type of the WiMAX NSP.
+

+
Default value: 0

+

+

+

+
The "signal-quality" property

+
  "signal-quality"           guint                 : Read

+

+The signal quality of the WiMAX NSP.
+

+
Allowed values: <= 100

+
Default value: 0

+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
new file mode 100644
index 00000000..37e2673f
--- /dev/null
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -0,0 +1,86 @@
+
+
+
+
+Annotation Glossary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Annotation Glossary

+
O

+

+out

+
Parameter for returning results. Default is transfer full.

+
S

+

+scope async

+
The callback is valid until first called.

+
A

+

+allow-none

+
NULL is ok, both for passing and for returning.

+
C

+

+closure

+
This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

+
T

+

+transfer none

+
Don't free data after the code is done.

+
A

+

+array

+
Parameter points to an array of items.

+
E

+

+element-type

+
Generics and defining elements of containers and arrays.

+
T

+

+transfer container

+
Free data container after the code is done.

+

+transfer full

+
Free data after the code is done.

+

+type

+
Override the parsed C type with given type

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
new file mode 100644
index 00000000..f2b1352a
--- /dev/null
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -0,0 +1,1989 @@
+
+
+
+
+API Index
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+API Index

+
A

+

+NMAccessPoint, struct in NMAccessPoint
+

+

+

+NMAccessPoint:bssid, object property in NMAccessPoint
+

+

+

+NMAccessPoint:flags, object property in NMAccessPoint
+

+

+

+NMAccessPoint:frequency, object property in NMAccessPoint
+

+

+

+NMAccessPoint:hw-address, object property in NMAccessPoint
+

+

+

+NMAccessPoint:max-bitrate, object property in NMAccessPoint
+

+

+

+NMAccessPoint:mode, object property in NMAccessPoint
+

+

+

+NMAccessPoint:rsn-flags, object property in NMAccessPoint
+

+

+

+NMAccessPoint:ssid, object property in NMAccessPoint
+

+

+

+NMAccessPoint:strength, object property in NMAccessPoint
+

+

+

+NMAccessPoint:wpa-flags, object property in NMAccessPoint
+

+

+

+NMAccessPointClass, struct in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_BSSID, macro in NMAccessPoint
+

+

+

+nm_access_point_connection_valid, function in NMAccessPoint
+

+

+

+nm_access_point_filter_connections, function in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_FLAGS, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_FREQUENCY, macro in NMAccessPoint
+

+

+

+nm_access_point_get_bssid, function in NMAccessPoint
+

+

+

+nm_access_point_get_flags, function in NMAccessPoint
+

+

+

+nm_access_point_get_frequency, function in NMAccessPoint
+

+

+

+nm_access_point_get_hw_address, function in NMAccessPoint
+

+

+

+nm_access_point_get_max_bitrate, function in NMAccessPoint
+

+

+

+nm_access_point_get_mode, function in NMAccessPoint
+

+

+

+nm_access_point_get_rsn_flags, function in NMAccessPoint
+

+

+

+nm_access_point_get_ssid, function in NMAccessPoint
+

+

+

+nm_access_point_get_strength, function in NMAccessPoint
+

+

+

+nm_access_point_get_wpa_flags, function in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_HW_ADDRESS, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_MAX_BITRATE, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_MODE, macro in NMAccessPoint
+

+

+

+nm_access_point_new, function in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_RSN_FLAGS, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_SSID, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_STRENGTH, macro in NMAccessPoint
+

+

+

+NM_ACCESS_POINT_WPA_FLAGS, macro in NMAccessPoint
+

+

+

+NMActiveConnection, struct in NMActiveConnection
+

+

+

+NMActiveConnection:connection, object property in NMActiveConnection
+

+

+

+NMActiveConnection:default, object property in NMActiveConnection
+

+

+

+NMActiveConnection:default6, object property in NMActiveConnection
+

+

+

+NMActiveConnection:devices, object property in NMActiveConnection
+

+

+

+NMActiveConnection:specific-object, object property in NMActiveConnection
+

+

+

+NMActiveConnection:state, object property in NMActiveConnection
+

+

+

+NMActiveConnectionClass, struct in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_CONNECTION, macro in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_DEFAULT, macro in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_DEFAULT6, macro in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_DEVICES, macro in NMActiveConnection
+

+

+

+nm_active_connection_get_connection, function in NMActiveConnection
+

+

+

+nm_active_connection_get_default, function in NMActiveConnection
+

+

+

+nm_active_connection_get_default6, function in NMActiveConnection
+

+

+

+nm_active_connection_get_devices, function in NMActiveConnection
+

+

+

+nm_active_connection_get_specific_object, function in NMActiveConnection
+

+

+

+nm_active_connection_get_state, function in NMActiveConnection
+

+

+

+nm_active_connection_get_uuid, function in NMActiveConnection
+

+

+

+nm_active_connection_new, function in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, macro in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_STATE, macro in NMActiveConnection
+

+

+

+NM_ACTIVE_CONNECTION_UUID, macro in NMActiveConnection
+

+

+
C

+

+NMClient, struct in NMClient
+

+

+

+NMClient::device-added, object signal in NMClient
+

+

+

+NMClient::device-removed, object signal in NMClient
+

+

+

+NMClient::permission-changed, object signal in NMClient
+

+

+

+NMClient:active-connections, object property in NMClient
+

+

+

+NMClient:manager-running, object property in NMClient
+

+

+

+NMClient:networking-enabled, object property in NMClient
+

+

+

+NMClient:state, object property in NMClient
+

+

+

+NMClient:version, object property in NMClient
+

+

+

+NMClient:wimax-enabled, object property in NMClient
+

+

+

+NMClient:wimax-hardware-enabled, object property in NMClient
+

+

+

+NMClient:wireless-enabled, object property in NMClient
+

+

+

+NMClient:wireless-hardware-enabled, object property in NMClient
+

+

+

+NMClient:wwan-enabled, object property in NMClient
+

+

+

+NMClient:wwan-hardware-enabled, object property in NMClient
+

+

+

+NMClientActivateFn, user_function in NMClient
+

+

+

+NMClientAddActivateFn, user_function in NMClient
+

+

+

+NMClientClass, struct in NMClient
+

+

+

+NMClientPermission, enum in NMClient
+

+

+

+NMClientPermissionResult, enum in NMClient
+

+

+

+nm_client_activate_connection, function in NMClient
+

+

+

+NM_CLIENT_ACTIVE_CONNECTIONS, macro in NMClient
+

+

+

+nm_client_add_and_activate_connection, function in NMClient
+

+

+

+nm_client_deactivate_connection, function in NMClient
+

+

+

+nm_client_get_active_connections, function in NMClient
+

+

+

+nm_client_get_devices, function in NMClient
+

+

+

+nm_client_get_device_by_path, function in NMClient
+

+

+

+nm_client_get_manager_running, function in NMClient
+

+

+

+nm_client_get_permission_result, function in NMClient
+

+

+

+nm_client_get_state, function in NMClient
+

+

+

+nm_client_get_version, function in NMClient
+

+

+

+NM_CLIENT_MANAGER_RUNNING, macro in NMClient
+

+

+

+NM_CLIENT_NETWORKING_ENABLED, macro in NMClient
+

+

+

+nm_client_networking_get_enabled, function in NMClient
+

+

+

+nm_client_networking_set_enabled, function in NMClient
+

+

+

+nm_client_new, function in NMClient
+

+

+

+nm_client_sleep, function in NMClient
+

+

+

+NM_CLIENT_STATE, macro in NMClient
+

+

+

+NM_CLIENT_VERSION, macro in NMClient
+

+

+

+NM_CLIENT_WIMAX_ENABLED, macro in NMClient
+

+

+

+nm_client_wimax_get_enabled, function in NMClient
+

+

+

+NM_CLIENT_WIMAX_HARDWARE_ENABLED, macro in NMClient
+

+

+

+nm_client_wimax_hardware_get_enabled, function in NMClient
+

+

+

+nm_client_wimax_set_enabled, function in NMClient
+

+

+

+NM_CLIENT_WIRELESS_ENABLED, macro in NMClient
+

+

+

+nm_client_wireless_get_enabled, function in NMClient
+

+

+

+NM_CLIENT_WIRELESS_HARDWARE_ENABLED, macro in NMClient
+

+

+

+nm_client_wireless_hardware_get_enabled, function in NMClient
+

+

+

+nm_client_wireless_set_enabled, function in NMClient
+

+

+

+NM_CLIENT_WWAN_ENABLED, macro in NMClient
+

+

+

+nm_client_wwan_get_enabled, function in NMClient
+

+

+

+NM_CLIENT_WWAN_HARDWARE_ENABLED, macro in NMClient
+

+

+

+nm_client_wwan_hardware_get_enabled, function in NMClient
+

+

+

+nm_client_wwan_set_enabled, function in NMClient
+

+

+
D

+

+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER, macro in nm-secret-agent-glue
+

+

+

+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER, macro in nm-secret-agent-glue
+

+

+

+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER, macro in nm-secret-agent-glue
+

+

+

+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER, function in nm-secret-agent-glue
+

+

+

+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER, function in nm-secret-agent-glue
+

+

+

+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-secret-agent-glue
+

+

+

+NMDevice, struct in NMDevice
+

+

+

+NMDevice::state-changed, object signal in NMDevice
+

+

+

+NMDevice:capabilities, object property in NMDevice
+

+

+

+NMDevice:device-type, object property in NMDevice
+

+

+

+NMDevice:dhcp4-config, object property in NMDevice
+

+

+

+NMDevice:dhcp6-config, object property in NMDevice
+

+

+

+NMDevice:driver, object property in NMDevice
+

+

+

+NMDevice:firmware-missing, object property in NMDevice
+

+

+

+NMDevice:interface, object property in NMDevice
+

+

+

+NMDevice:ip-interface, object property in NMDevice
+

+

+

+NMDevice:ip4-config, object property in NMDevice
+

+

+

+NMDevice:ip6-config, object property in NMDevice
+

+

+

+NMDevice:managed, object property in NMDevice
+

+

+

+NMDevice:product, object property in NMDevice
+

+

+

+NMDevice:state, object property in NMDevice
+

+

+

+NMDevice:udi, object property in NMDevice
+

+

+

+NMDevice:vendor, object property in NMDevice
+

+

+

+NMDeviceBt, struct in NMDeviceBt
+

+

+

+NMDeviceBt:bt-capabilities, object property in NMDeviceBt
+

+

+

+NMDeviceBt:hw-address, object property in NMDeviceBt
+

+

+

+NMDeviceBt:name, object property in NMDeviceBt
+

+

+

+NMDeviceBtClass, struct in NMDeviceBt
+

+

+

+NMDeviceClass, struct in NMDevice
+

+

+

+NMDeviceDeactivateFn, user_function in NMDevice
+

+

+

+NMDeviceEthernet, struct in NMDeviceEthernet
+

+

+

+NMDeviceEthernet:carrier, object property in NMDeviceEthernet
+

+

+

+NMDeviceEthernet:hw-address, object property in NMDeviceEthernet
+

+

+

+NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet
+

+

+

+NMDeviceEthernet:speed, object property in NMDeviceEthernet
+

+

+

+NMDeviceEthernetClass, struct in NMDeviceEthernet
+

+

+

+NMDeviceModem, struct in NMDeviceModem
+

+

+

+NMDeviceModem:current-capabilities, object property in NMDeviceModem
+

+

+

+NMDeviceModem:modem-capabilities, object property in NMDeviceModem
+

+

+

+NMDeviceModemClass, struct in NMDeviceModem
+

+

+

+NMDeviceWifi, struct in NMDeviceWifi
+

+

+

+NMDeviceWifi::access-point-added, object signal in NMDeviceWifi
+

+

+

+NMDeviceWifi::access-point-removed, object signal in NMDeviceWifi
+

+

+

+NMDeviceWifi:active-access-point, object property in NMDeviceWifi
+

+

+

+NMDeviceWifi:bitrate, object property in NMDeviceWifi
+

+

+

+NMDeviceWifi:hw-address, object property in NMDeviceWifi
+

+

+

+NMDeviceWifi:mode, object property in NMDeviceWifi
+

+

+

+NMDeviceWifi:perm-hw-address, object property in NMDeviceWifi
+

+

+

+NMDeviceWifi:wireless-capabilities, object property in NMDeviceWifi
+

+

+

+NMDeviceWifiClass, struct in NMDeviceWifi
+

+

+

+NMDeviceWimax, struct in NMDeviceWimax
+

+

+

+NMDeviceWimax::nsp-added, object signal in NMDeviceWimax
+

+

+

+NMDeviceWimax::nsp-removed, object signal in NMDeviceWimax
+

+

+

+NMDeviceWimax:active-nsp, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:bsid, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:center-frequency, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:cinr, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:hw-address, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:rssi, object property in NMDeviceWimax
+

+

+

+NMDeviceWimax:tx-power, object property in NMDeviceWimax
+

+

+

+NMDeviceWimaxClass, struct in NMDeviceWimax
+

+

+

+NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
+

+

+

+nm_device_bt_get_capabilities, function in NMDeviceBt
+

+

+

+nm_device_bt_get_hw_address, function in NMDeviceBt
+

+

+

+nm_device_bt_get_name, function in NMDeviceBt
+

+

+

+NM_DEVICE_BT_HW_ADDRESS, macro in NMDeviceBt
+

+

+

+NM_DEVICE_BT_NAME, macro in NMDeviceBt
+

+

+

+nm_device_bt_new, function in NMDeviceBt
+

+

+

+NM_DEVICE_CAPABILITIES, macro in NMDevice
+

+

+

+nm_device_connection_valid, function in NMDevice
+

+

+

+NM_DEVICE_DEVICE_TYPE, macro in NMDevice
+

+

+

+NM_DEVICE_DHCP4_CONFIG, macro in NMDevice
+

+

+

+NM_DEVICE_DHCP6_CONFIG, macro in NMDevice
+

+

+

+nm_device_disconnect, function in NMDevice
+

+

+

+NM_DEVICE_DRIVER, macro in NMDevice
+

+

+

+NM_DEVICE_ETHERNET_CARRIER, macro in NMDeviceEthernet
+

+

+

+nm_device_ethernet_get_carrier, function in NMDeviceEthernet
+

+

+

+nm_device_ethernet_get_hw_address, function in NMDeviceEthernet
+

+

+

+nm_device_ethernet_get_permanent_hw_address, function in NMDeviceEthernet
+

+

+

+nm_device_ethernet_get_speed, function in NMDeviceEthernet
+

+

+

+NM_DEVICE_ETHERNET_HW_ADDRESS, macro in NMDeviceEthernet
+

+

+

+nm_device_ethernet_new, function in NMDeviceEthernet
+

+

+

+NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS, macro in NMDeviceEthernet
+

+

+

+NM_DEVICE_ETHERNET_SPEED, macro in NMDeviceEthernet
+

+

+

+nm_device_filter_connections, function in NMDevice
+

+

+

+NM_DEVICE_FIRMWARE_MISSING, macro in NMDevice
+

+

+

+nm_device_get_capabilities, function in NMDevice
+

+

+

+nm_device_get_device_type, function in NMDevice
+

+

+

+nm_device_get_dhcp4_config, function in NMDevice
+

+

+

+nm_device_get_dhcp6_config, function in NMDevice
+

+

+

+nm_device_get_driver, function in NMDevice
+

+

+

+nm_device_get_firmware_missing, function in NMDevice
+

+

+

+nm_device_get_iface, function in NMDevice
+

+

+

+nm_device_get_ip4_config, function in NMDevice
+

+

+

+nm_device_get_ip6_config, function in NMDevice
+

+

+

+nm_device_get_ip_iface, function in NMDevice
+

+

+

+nm_device_get_managed, function in NMDevice
+

+

+

+nm_device_get_product, function in NMDevice
+

+

+

+nm_device_get_state, function in NMDevice
+

+

+

+nm_device_get_udi, function in NMDevice
+

+

+

+nm_device_get_vendor, function in NMDevice
+

+

+

+NM_DEVICE_INTERFACE, macro in NMDevice
+

+

+

+NM_DEVICE_IP4_CONFIG, macro in NMDevice
+

+

+

+NM_DEVICE_IP6_CONFIG, macro in NMDevice
+

+

+

+NM_DEVICE_IP_INTERFACE, macro in NMDevice
+

+

+

+NM_DEVICE_MANAGED, macro in NMDevice
+

+

+

+NM_DEVICE_MODEM_CURRENT_CAPABILITIES, macro in NMDeviceModem
+

+

+

+nm_device_modem_get_current_capabilities, function in NMDeviceModem
+

+

+

+nm_device_modem_get_modem_capabilities, function in NMDeviceModem
+

+

+

+NM_DEVICE_MODEM_MODEM_CAPABILITIES, macro in NMDeviceModem
+

+

+

+nm_device_new, function in NMDevice
+

+

+

+NM_DEVICE_PRODUCT, macro in NMDevice
+

+

+

+NM_DEVICE_STATE, macro in NMDevice
+

+

+

+NM_DEVICE_UDI, macro in NMDevice
+

+

+

+NM_DEVICE_VENDOR, macro in NMDevice
+

+

+

+NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, macro in NMDeviceWifi
+

+

+

+NM_DEVICE_WIFI_BITRATE, macro in NMDeviceWifi
+

+

+

+NM_DEVICE_WIFI_CAPABILITIES, macro in NMDeviceWifi
+

+

+

+nm_device_wifi_get_access_points, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_access_point_by_path, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_active_access_point, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_bitrate, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_capabilities, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_hw_address, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_mode, function in NMDeviceWifi
+

+

+

+nm_device_wifi_get_permanent_hw_address, function in NMDeviceWifi
+

+

+

+NM_DEVICE_WIFI_HW_ADDRESS, macro in NMDeviceWifi
+

+

+

+NM_DEVICE_WIFI_MODE, macro in NMDeviceWifi
+

+

+

+nm_device_wifi_new, function in NMDeviceWifi
+

+

+

+NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS, macro in NMDeviceWifi
+

+

+

+NM_DEVICE_WIMAX_ACTIVE_NSP, macro in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_BSID, macro in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_CENTER_FREQUENCY, macro in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_CINR, macro in NMDeviceWimax
+

+

+

+nm_device_wimax_get_active_nsp, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_bsid, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_center_frequency, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_cinr, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_hw_address, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_nsps, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_nsp_by_path, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_rssi, function in NMDeviceWimax
+

+

+

+nm_device_wimax_get_tx_power, function in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_HW_ADDRESS, macro in NMDeviceWimax
+

+

+

+nm_device_wimax_new, function in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_RSSI, macro in NMDeviceWimax
+

+

+

+NM_DEVICE_WIMAX_TX_POWER, macro in NMDeviceWimax
+

+

+

+NMDHCP4Config, struct in NMDHCP4Config
+

+

+

+NMDHCP4Config:options, object property in NMDHCP4Config
+

+

+

+NMDHCP4ConfigClass, struct in NMDHCP4Config
+

+

+

+nm_dhcp4_config_get_one_option, function in NMDHCP4Config
+

+

+

+nm_dhcp4_config_get_options, function in NMDHCP4Config
+

+

+

+nm_dhcp4_config_new, function in NMDHCP4Config
+

+

+

+NM_DHCP4_CONFIG_OPTIONS, macro in NMDHCP4Config
+

+

+

+NMDHCP6Config, struct in NMDHCP6Config
+

+

+

+NMDHCP6Config:options, object property in NMDHCP6Config
+

+

+

+NMDHCP6ConfigClass, struct in NMDHCP6Config
+

+

+

+nm_dhcp6_config_get_one_option, function in NMDHCP6Config
+

+

+

+nm_dhcp6_config_get_options, function in NMDHCP6Config
+

+

+

+nm_dhcp6_config_new, function in NMDHCP6Config
+

+

+

+NM_DHCP6_CONFIG_OPTIONS, macro in NMDHCP6Config
+

+

+
G

+

+g_marshal_value_peek_boolean, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_boxed, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_char, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_double, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_enum, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_flags, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_float, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_int, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_int64, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_long, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_object, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_param, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_pointer, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_string, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_uchar, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_uint, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_uint64, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_ulong, macro in nm-secret-agent-glue
+

+

+

+g_marshal_value_peek_variant, macro in nm-secret-agent-glue
+

+

+
I

+

+NMIP4Config, struct in NMIP4Config
+

+

+

+NMIP4Config:addresses, object property in NMIP4Config
+

+

+

+NMIP4Config:domains, object property in NMIP4Config
+

+

+

+NMIP4Config:nameservers, object property in NMIP4Config
+

+

+

+NMIP4Config:routes, object property in NMIP4Config
+

+

+

+NMIP4Config:wins-servers, object property in NMIP4Config
+

+

+

+NMIP4ConfigClass, struct in NMIP4Config
+

+

+

+NM_IP4_CONFIG_ADDRESSES, macro in NMIP4Config
+

+

+

+NM_IP4_CONFIG_DOMAINS, macro in NMIP4Config
+

+

+

+nm_ip4_config_get_addresses, function in NMIP4Config
+

+

+

+nm_ip4_config_get_domains, function in NMIP4Config
+

+

+

+nm_ip4_config_get_nameservers, function in NMIP4Config
+

+

+

+nm_ip4_config_get_routes, function in NMIP4Config
+

+

+

+nm_ip4_config_get_wins_servers, function in NMIP4Config
+

+

+

+NM_IP4_CONFIG_NAMESERVERS, macro in NMIP4Config
+

+

+

+nm_ip4_config_new, function in NMIP4Config
+

+

+

+NM_IP4_CONFIG_ROUTES, macro in NMIP4Config
+

+

+

+NM_IP4_CONFIG_WINS_SERVERS, macro in NMIP4Config
+

+

+

+NMIP6Config, struct in NMIP6Config
+

+

+

+NMIP6Config:addresses, object property in NMIP6Config
+

+

+

+NMIP6Config:domains, object property in NMIP6Config
+

+

+

+NMIP6Config:nameservers, object property in NMIP6Config
+

+

+

+NMIP6Config:routes, object property in NMIP6Config
+

+

+

+NMIP6ConfigClass, struct in NMIP6Config
+

+

+

+nm_ip6_address_array_get_type, function in nm-types
+

+

+

+nm_ip6_address_object_array_get_type, function in nm-types
+

+

+

+NM_IP6_CONFIG_ADDRESSES, macro in NMIP6Config
+

+

+

+NM_IP6_CONFIG_DOMAINS, macro in NMIP6Config
+

+

+

+nm_ip6_config_get_addresses, function in NMIP6Config
+

+

+

+nm_ip6_config_get_domains, function in NMIP6Config
+

+

+

+nm_ip6_config_get_nameservers, function in NMIP6Config
+

+

+

+nm_ip6_config_get_routes, function in NMIP6Config
+

+

+

+NM_IP6_CONFIG_NAMESERVERS, macro in NMIP6Config
+

+

+

+nm_ip6_config_new, function in NMIP6Config
+

+

+

+NM_IP6_CONFIG_ROUTES, macro in NMIP6Config
+

+

+

+nm_ip6_route_object_array_get_type, function in nm-types
+

+

+

+NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi
+

+

+
O

+

+NMObject, struct in NMObject
+

+

+

+NMObject:dbus-connection, object property in NMObject
+

+

+

+NMObject:dbus-path, object property in NMObject
+

+

+

+NMObjectClass, struct in NMObject
+

+

+

+nm_object_array_get_type, function in nm-types
+

+

+

+NM_OBJECT_DBUS_CONNECTION, macro in NMObject
+

+

+

+NM_OBJECT_DBUS_PATH, macro in NMObject
+

+

+

+nm_object_get_connection, function in NMObject
+

+

+

+nm_object_get_path, function in NMObject
+

+

+
R

+

+NMRemoteConnection, struct in NMRemoteConnection
+

+

+

+NMRemoteConnection::removed, object signal in NMRemoteConnection
+

+

+

+NMRemoteConnection::updated, object signal in NMRemoteConnection
+

+

+

+NMRemoteConnection::visible, object signal in NMRemoteConnection
+

+

+

+NMRemoteConnection:bus, object property in NMRemoteConnection
+

+

+

+NMRemoteConnection:init-result, object property in NMRemoteConnection
+

+

+

+NMRemoteConnectionClass, struct in NMRemoteConnection
+

+

+

+NMRemoteConnectionCommitFunc, user_function in NMRemoteConnection
+

+

+

+NMRemoteConnectionDeleteFunc, user_function in NMRemoteConnection
+

+

+

+NMRemoteConnectionGetSecretsFunc, user_function in NMRemoteConnection
+

+

+

+NMRemoteSettings, struct in NMRemoteSettings
+

+

+

+NMRemoteSettings::connections-read, object signal in NMRemoteSettings
+

+

+

+NMRemoteSettings::new-connection, object signal in NMRemoteSettings
+

+

+

+NMRemoteSettings:bus, object property in NMRemoteSettings
+

+

+

+NMRemoteSettings:can-modify, object property in NMRemoteSettings
+

+

+

+NMRemoteSettings:hostname, object property in NMRemoteSettings
+

+

+

+NMRemoteSettings:service-running, object property in NMRemoteSettings
+

+

+

+NMRemoteSettingsAddConnectionFunc, user_function in NMRemoteSettings
+

+

+

+NMRemoteSettingsClass, struct in NMRemoteSettings
+

+

+

+NMRemoteSettingsError, enum in NMRemoteSettings
+

+

+

+NMRemoteSettingsSaveHostnameFunc, user_function in NMRemoteSettings
+

+

+

+nm_remote_connection_commit_changes, function in NMRemoteConnection
+

+

+

+nm_remote_connection_delete, function in NMRemoteConnection
+

+

+

+nm_remote_connection_get_secrets, function in NMRemoteConnection
+

+

+

+nm_remote_connection_new, function in NMRemoteConnection
+

+

+

+NM_REMOTE_CONNECTION_REMOVED, macro in NMRemoteConnection
+

+

+

+NM_REMOTE_CONNECTION_UPDATED, macro in NMRemoteConnection
+

+

+

+nm_remote_settings_add_connection, function in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_BUS, macro in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_CAN_MODIFY, macro in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_CONNECTIONS_READ, macro in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings
+

+

+

+nm_remote_settings_error_quark, function in NMRemoteSettings
+

+

+

+nm_remote_settings_get_connection_by_path, function in NMRemoteSettings
+

+

+

+nm_remote_settings_get_connection_by_uuid, function in NMRemoteSettings
+

+

+

+nm_remote_settings_get_type, function in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_HOSTNAME, macro in NMRemoteSettings
+

+

+

+nm_remote_settings_list_connections, function in NMRemoteSettings
+

+

+

+nm_remote_settings_new, function in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_NEW_CONNECTION, macro in NMRemoteSettings
+

+

+

+nm_remote_settings_save_hostname, function in NMRemoteSettings
+

+

+

+NM_REMOTE_SETTINGS_SERVICE_RUNNING, macro in NMRemoteSettings
+

+

+
S

+

+NMSecretAgent, struct in NMSecretAgent
+

+

+

+NMSecretAgent::registration-result, object signal in NMSecretAgent
+

+

+

+NMSecretAgent:auto-register, object property in NMSecretAgent
+

+

+

+NMSecretAgent:identifier, object property in NMSecretAgent
+

+

+

+NMSecretAgentClass, struct in NMSecretAgent
+

+

+

+NMSecretAgentDeleteSecretsFunc, user_function in NMSecretAgent
+

+

+

+NMSecretAgentError, enum in NMSecretAgent
+

+

+

+NMSecretAgentGetSecretsFlags, enum in NMSecretAgent
+

+

+

+NMSecretAgentGetSecretsFunc, user_function in NMSecretAgent
+

+

+

+NMSecretAgentSaveSecretsFunc, user_function in NMSecretAgent
+

+

+

+NM_SECRET_AGENT_AUTO_REGISTER, macro in NMSecretAgent
+

+

+

+nm_secret_agent_delete_secrets, function in NMSecretAgent
+

+

+

+NM_SECRET_AGENT_ERROR, macro in NMSecretAgent
+

+

+

+nm_secret_agent_error_quark, function in NMSecretAgent
+

+

+

+nm_secret_agent_get_secrets, function in NMSecretAgent
+

+

+

+nm_secret_agent_get_type, function in NMSecretAgent
+

+

+

+NM_SECRET_AGENT_IDENTIFIER, macro in NMSecretAgent
+

+

+

+nm_secret_agent_register, function in NMSecretAgent
+

+

+

+NM_SECRET_AGENT_REGISTRATION_RESULT, macro in NMSecretAgent
+

+

+

+nm_secret_agent_save_secrets, function in NMSecretAgent
+

+

+

+nm_secret_agent_unregister, function in NMSecretAgent
+

+

+

+nm_ssid_get_type, function in nm-types
+

+

+

+nm_string_array_get_type, function in nm-types
+

+

+
T

+

+NM_TYPE_IP6_ADDRESS_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_IP6_ROUTE_OBJECT_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_OBJECT_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings
+

+

+

+NM_TYPE_SECRET_AGENT_ERROR, macro in NMSecretAgent
+

+

+

+NM_TYPE_SSID, macro in nm-types
+

+

+

+NM_TYPE_STRING_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_UINT_ARRAY, macro in nm-types
+

+

+

+NM_TYPE_VPN_PLUGIN_ERROR, macro in NMVPNPlugin
+

+

+

+NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi
+

+

+
U

+

+nm_uint_array_get_type, function in nm-types
+

+

+
V

+

+NMVPNConnection, struct in NMVPNConnection
+

+

+

+NMVPNConnection::vpn-state-changed, object signal in NMVPNConnection
+

+

+

+NMVPNConnection:banner, object property in NMVPNConnection
+

+

+

+NMVPNConnection:vpn-state, object property in NMVPNConnection
+

+

+

+NMVPNConnectionClass, struct in NMVPNConnection
+

+

+

+NMVPNPlugin, struct in NMVPNPlugin
+

+

+

+NMVPNPluginClass, struct in NMVPNPlugin
+

+

+

+NMVPNPluginError, enum in NMVPNPlugin
+

+

+

+NMVpnPluginUiFactory, user_function in NMVpnPluginUi
+

+

+

+NMVpnPluginUiInterface, struct in NMVpnPluginUi
+

+

+

+NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUi
+

+

+

+NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUi
+

+

+

+NM_VPN_CONNECTION_BANNER, macro in NMVPNConnection
+

+

+

+nm_vpn_connection_get_banner, function in NMVPNConnection
+

+

+

+nm_vpn_connection_get_vpn_state, function in NMVPNConnection
+

+

+

+nm_vpn_connection_new, function in NMVPNConnection
+

+

+

+NM_VPN_CONNECTION_VPN_STATE, macro in NMVPNConnection
+

+

+

+NM_VPN_PLUGIN_DBUS_SERVICE_NAME, macro in NMVPNPlugin
+

+

+

+nm_vpn_plugin_disconnect, function in NMVPNPlugin
+

+

+

+NM_VPN_PLUGIN_ERROR, macro in NMVPNPlugin
+

+

+

+nm_vpn_plugin_error_get_type, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_error_quark, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_failure, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_get_connection, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_get_state, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_set_ip4_config, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_set_login_banner, function in NMVPNPlugin
+

+

+

+nm_vpn_plugin_set_state, function in NMVPNPlugin
+

+

+

+NM_VPN_PLUGIN_STATE, macro in NMVPNPlugin
+

+

+

+NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT, macro in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT, macro in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_CAPABILITY_NONE, macro in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_factory, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi
+

+

+

+NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE, macro in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_widget_interface_get_type, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUi
+

+

+

+nm_vpn_plugin_utils_get_secret_flags, function in nm-vpn-plugin-utils
+

+

+

+nm_vpn_plugin_utils_read_vpn_details, function in nm-vpn-plugin-utils
+

+

+
W

+

+NMWimaxNsp, struct in NMWimaxNsp
+

+

+

+NMWimaxNsp:name, object property in NMWimaxNsp
+

+

+

+NMWimaxNsp:network-type, object property in NMWimaxNsp
+

+

+

+NMWimaxNsp:signal-quality, object property in NMWimaxNsp
+

+

+

+NMWimaxNspClass, struct in NMWimaxNsp
+

+

+

+NMWimaxNspNetworkType, enum in NMWimaxNsp
+

+

+

+nm_wimax_nsp_connection_valid, function in NMWimaxNsp
+

+

+

+nm_wimax_nsp_filter_connections, function in NMWimaxNsp
+

+

+

+nm_wimax_nsp_get_name, function in NMWimaxNsp
+

+

+

+nm_wimax_nsp_get_network_type, function in NMWimaxNsp
+

+

+

+nm_wimax_nsp_get_signal_quality, function in NMWimaxNsp
+

+

+

+NM_WIMAX_NSP_NAME, macro in NMWimaxNsp
+

+

+

+NM_WIMAX_NSP_NETWORK_TYPE, macro in NMWimaxNsp
+

+

+

+nm_wimax_nsp_new, function in NMWimaxNsp
+

+

+

+NM_WIMAX_NSP_SIGNAL_QUALITY, macro in NMWimaxNsp
+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch01.html b/docs/libnm-glib/html/ch01.html
deleted file mode 100644
index df7fcc7e..00000000
--- a/docs/libnm-glib/html/ch01.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-libnm-glib Objects
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-libnm-glib Objects

-

-

-NMClient
-

-

-NMActiveConnection
-

-

-NMDevice
-

-

-NMDeviceEthernet
-

-

-NMDeviceWifi
-

-

-NMSerialDevice
-

-

-NMGsmDevice
-

-

-NMCdmaDevice
-

-

-NMDeviceBt
-

-

-NMAccessPoint
-

-

-NMIP4Config
-

-

-NMIP6Config
-

-

-NMDHCP4Config
-

-

-NMDHCP6Config
-

-

-NMExportedConnection
-

-

-NMObject
-

-

-NMRemoteConnection
-

-

-NMRemoteSettings
-

-

-NMRemoteSettingsSystem
-

-

-NMSettingsConnection
-

-

-NMSettings
-

-

-NMSettingsService
-

-

-NMSettingsSystem
-

-

-nm-types
-

-

-NMVPNConnection
-

-

-NMVPNPlugin
-

-

-NMVpnPluginUi
-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
new file mode 100644
index 00000000..6d814661
--- /dev/null
+++ b/docs/libnm-glib/html/ch02.html
@@ -0,0 +1,98 @@
+
+
+
+
+libnm-glib API Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+libnm-glib API Reference

+

+

+NMClient
+

+

+NMActiveConnection
+

+

+NMDevice
+

+

+NMDeviceEthernet
+

+

+NMDeviceWifi
+

+

+NMDeviceModem
+

+

+NMDeviceBt
+

+

+NMDeviceWimax
+

+

+NMWimaxNsp
+

+

+NMAccessPoint
+

+

+NMIP4Config
+

+

+NMIP6Config
+

+

+NMDHCP4Config
+

+

+NMDHCP6Config
+

+

+NMObject
+

+

+NMRemoteConnection
+

+

+NMRemoteSettings
+

+

+nm-types
+

+

+NMSecretAgent
+

+

+NMVPNConnection
+

+

+NMVPNPlugin
+

+

+NMVpnPluginUi
+

+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 53f21016..0eb745a3 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -5,25 +5,64 @@
 libnm-glib Reference Manual
 
 
-
-
+
+
 
 
 
-

+

 

 

 

+

+

+Dan Williams
+

+


+	    

+	  

+

 

-      for libnm-glib 0.8
+      for libnm-glib 0.9
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/.
+      http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
     

+
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
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the GNU Free
+	Documentation License from the Free Software
+	Foundation by visiting their Web site or by writing
+	to:
+
+	

+


+	  The Free Software Foundation, Inc.,

+	  59 Temple Place - Suite 330,

+	  Boston, MA 02111-1307,

+	  USA

+	

+

+      

+

+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      

+

 

 

 

 

-
libnm-glib Objects

+
Object Overview

+
libnm-glib API Reference

 

 

 NMClient
@@ -41,16 +80,16 @@
 NMDeviceWifi
 

 

-NMSerialDevice
+NMDeviceModem
 

 

-NMGsmDevice
+NMDeviceBt
 

 

-NMCdmaDevice
+NMDeviceWimax
 

 

-NMDeviceBt
+NMWimaxNsp
 

 

 NMAccessPoint
@@ -68,9 +107,6 @@
 NMDHCP6Config
 

 

-NMExportedConnection
-

-

 NMObject
 

 

@@ -80,22 +116,10 @@
 NMRemoteSettings
 

 

-NMRemoteSettingsSystem
-

-

-NMSettingsConnection
-

-

-NMSettings
-

-

-NMSettingsService
-

-

-NMSettingsSystem
+nm-types
 

 

-nm-types
+NMSecretAgent
 

 

 NMVPNConnection
@@ -107,10 +131,13 @@
 NMVpnPluginUi
 

 

+
Object Hierarchy

+
API Index

+
Annotation Glossary

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index e3c76b21..de8edceb 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -6,6 +6,7 @@
 
 
 
+
 
 
 
@@ -13,6 +14,8 @@
 
 
 
+
+
 
 
 
@@ -21,8 +24,10 @@
 
 
 
-
+
 
+
+
 
 
 
@@ -32,6 +37,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -42,6 +51,9 @@
 
 
 
+
+
+
 
 
 
@@ -56,8 +68,8 @@
 
 
 
-
 
+
 
 
 
@@ -66,9 +78,8 @@
 
 
 
-
-
 
+
 
 
 
@@ -79,7 +90,6 @@
 
 
 
-
 
 
 
@@ -89,6 +99,7 @@
 
 
 
+
 
 
 
@@ -108,6 +119,7 @@
 
 
 
+
 
 
 
@@ -122,8 +134,11 @@
 
 
 
+
+
 
 
+
 
 
 
@@ -195,34 +210,21 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -242,6 +244,65 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -252,11 +313,12 @@
 
 
 
+
 
-
 
 
 
+
 
 
 
@@ -264,12 +326,16 @@
 
 
 
+
 
-
 
 
 
+
+
+
 
+
 
 
 
@@ -288,14 +354,12 @@
 
 
 
-
 
 
 
 
 
 
-
 
 
 
@@ -303,7 +367,6 @@
 
 
 
-
 
 
 
@@ -357,15 +420,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
 
 
 
@@ -384,103 +438,67 @@
 
 
 
-
 
+
 
 
+
+
 
 
+
+
+
 
+
+
+
 
 
 
+
+
+
+
 
 
 
-
 
+
 
 
+
+
+
+
+
+
+
 
-
 
+
+
+
+
+
+
 
 
+
 
+
+
+
+
+
 
 
-
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
 
 
 
@@ -499,6 +517,40 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -542,8 +594,6 @@
 
 
 
-
-
 
 
 
@@ -553,6 +603,7 @@
 
 
 
+
 
 
 
@@ -563,7 +614,18 @@
 
 
 
+
 
 
 
 
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html b/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html
deleted file mode 100644
index e2762112..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMRemoteSettingsSystem.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-NMRemoteSettingsSystem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMRemoteSettingsSystem

-
NMRemoteSettingsSystem

-

-

-
Synopsis

-
                    NMRemoteSettingsSystem;
-                    NMRemoteSettingsSystemClass;
-NMRemoteSettingsSystem * nm_remote_settings_system_new  (DBusGConnection *bus);
-

-

-

-
Description

-

-

-

-

-
Details

-

-
NMRemoteSettingsSystem

-
typedef struct {
-	NMRemoteSettings parent;
-} NMRemoteSettingsSystem;
-

-

-

-

-

-

-
NMRemoteSettingsSystemClass

-
typedef struct {
-	NMRemoteSettingsClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMRemoteSettingsSystemClass;
-

-

-

-

-

-

-
nm_remote_settings_system_new ()

-
NMRemoteSettingsSystem * nm_remote_settings_system_new  (DBusGConnection *bus);

-

-Creates a new object representing the remote system settings service.
-

-

--
-
-
-
-
-
-
-
-
-
-


bus :
a valid and connected D-Bus connection
-
Returns :
 the new remote system settings object on success, or NULL on failure
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettings.html b/docs/libnm-glib/html/libnm-glib-NMSettings.html
deleted file mode 100644
index 160eaca6..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettings.html
+++ /dev/null
@@ -1,310 +0,0 @@
-
-
-
-
-NMSettings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMSettings

-
NMSettings

-

-

-
Synopsis

-
enum                NMSettingsInterfaceError;
-#define             NM_SETTINGS_INTERFACE_ERROR
-GQuark              nm_settings_interface_error_quark   (void);
-#define             NM_TYPE_SETTINGS_INTERFACE_ERROR
-#define             NM_SETTINGS_INTERFACE_NEW_CONNECTION
-#define             NM_SETTINGS_INTERFACE_CONNECTIONS_READ
-                    NMSettingsInterface;
-void                (*NMSettingsAddConnectionFunc)      (NMSettingsInterface *settings,
-                                                         GError *error,
-                                                         gpointer user_data);
-GType               nm_settings_interface_get_type      (void);
-GSList *            nm_settings_interface_list_connections
-                                                        (NMSettingsInterface *settings);
-NMSettingsConnectionInterface * nm_settings_interface_get_connection_by_path
-                                                        (NMSettingsInterface *settings,
-                                                         const char *path);
-gboolean            nm_settings_interface_add_connection
-                                                        (NMSettingsInterface *settings,
-                                                         NMConnection *connection,
-                                                         NMSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);
-

-

-

-
Object Hierarchy

-
-  GInterface
-   +----NMSettingsInterface
-

-

-

-
Prerequisites

-

-NMSettingsInterface requires
- GObject.

-

-

-
Known Implementations

-

-NMSettingsInterface is implemented by
- NMRemoteSettings.

-

-

-
Description

-

-

-

-

-
Details

-

-
enum NMSettingsInterfaceError

-
typedef enum {
-	NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION = 0,
-	NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION,
-	NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
-	NM_SETTINGS_INTERFACE_ERROR_SECRETS_UNAVAILABLE,
-	NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED,
-	NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED,
-	NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING,
-} NMSettingsInterfaceError;
-

-

-

-

-

-

-
NM_SETTINGS_INTERFACE_ERROR

-
#define NM_SETTINGS_INTERFACE_ERROR (nm_settings_interface_error_quark ())
-

-

-

-

-

-

-
nm_settings_interface_error_quark ()

-
GQuark              nm_settings_interface_error_quark   (void);

-

-Setting error quark.
-

-

--
-
-
-
-


Returns :
 the setting error quark
-

-

-

-

-
NM_TYPE_SETTINGS_INTERFACE_ERROR

-
#define NM_TYPE_SETTINGS_INTERFACE_ERROR (nm_settings_interface_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTINGS_INTERFACE_NEW_CONNECTION

-
#define NM_SETTINGS_INTERFACE_NEW_CONNECTION   "new-connection"
-

-

-

-

-

-

-
NM_SETTINGS_INTERFACE_CONNECTIONS_READ

-
#define NM_SETTINGS_INTERFACE_CONNECTIONS_READ "connections-read"
-

-

-

-

-

-

-
NMSettingsInterface

-
typedef struct _NMSettingsInterface NMSettingsInterface;

-

-

-

-

-

-
NMSettingsAddConnectionFunc ()

-
void                (*NMSettingsAddConnectionFunc)      (NMSettingsInterface *settings,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :

-
error :

-
user_data :

-

-

-

-

-
nm_settings_interface_get_type ()

-
GType               nm_settings_interface_get_type      (void);

-

-

-

--
-
-
-
-


Returns :

-

-

-

-

-
nm_settings_interface_list_connections ()

-
GSList *            nm_settings_interface_list_connections
-                                                        (NMSettingsInterface *settings);

-

-

-

--
-
-
-
-
-
-
-
-
-
-


settings :

-
Returns :

-

-

-

-

-
nm_settings_interface_get_connection_by_path ()

-
NMSettingsConnectionInterface * nm_settings_interface_get_connection_by_path
-                                                        (NMSettingsInterface *settings,
-                                                         const char *path);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :

-
path :

-
Returns :

-

-

-

-

-
nm_settings_interface_add_connection ()

-
gboolean            nm_settings_interface_add_connection
-                                                        (NMSettingsInterface *settings,
-                                                         NMConnection *connection,
-                                                         NMSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);

-

-Requests that the settings service add the given settings to a new connection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :
a object implementing NMSettingsInterface
-
connection :
the settings to add; note that this object's settings will be
- added, not the object itself
-
callback :
callback to be called when the add operation completes
-
user_data :
caller-specific data passed to callback
-
Returns :
 TRUE if the request was successful, FALSE if it failed
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html b/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html
deleted file mode 100644
index c5ed0d3c..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsConnection.html
+++ /dev/null
@@ -1,375 +0,0 @@
-
-
-
-
-NMSettingsConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMSettingsConnection

-
NMSettingsConnection

-

-

-
Synopsis

-
#define             NM_SETTINGS_CONNECTION_INTERFACE_UPDATED
-#define             NM_SETTINGS_CONNECTION_INTERFACE_REMOVED
-                    NMSettingsConnectionInterface;
-void                (*NMSettingsConnectionInterfaceUpdateFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMSettingsConnectionInterfaceDeleteFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMSettingsConnectionInterfaceGetSecretsFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);
-gboolean            nm_settings_connection_interface_update
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         NMSettingsConnectionInterfaceUpdateFunc callback,
-                                                         gpointer user_data);
-gboolean            nm_settings_connection_interface_delete
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         NMSettingsConnectionInterfaceDeleteFunc callback,
-                                                         gpointer user_data);
-gboolean            nm_settings_connection_interface_get_secrets
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         const char *setting_name,
-                                                         const char **hints,
-                                                         gboolean request_new,
-                                                         NMSettingsConnectionInterfaceGetSecretsFunc callback,
-                                                         gpointer user_data);
-void                nm_settings_connection_interface_emit_updated
-                                                        (NMSettingsConnectionInterface *connection);
-

-

-

-
Object Hierarchy

-
-  GInterface
-   +----NMSettingsConnectionInterface
-

-

-

-
Prerequisites

-

-NMSettingsConnectionInterface requires
- NMConnection.

-

-

-
Known Implementations

-

-NMSettingsConnectionInterface is implemented by
- NMExportedConnection and  NMRemoteConnection.

-

-

-
Description

-

-

-

-

-
Details

-

-
NM_SETTINGS_CONNECTION_INTERFACE_UPDATED

-
#define NM_SETTINGS_CONNECTION_INTERFACE_UPDATED               "updated"
-

-

-

-

-

-

-
NM_SETTINGS_CONNECTION_INTERFACE_REMOVED

-
#define NM_SETTINGS_CONNECTION_INTERFACE_REMOVED               "removed"
-

-

-

-

-

-

-
NMSettingsConnectionInterface

-
typedef struct _NMSettingsConnectionInterface NMSettingsConnectionInterface;

-

-

-

-

-

-
NMSettingsConnectionInterfaceUpdateFunc ()

-
void                (*NMSettingsConnectionInterfaceUpdateFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :

-
error :

-
user_data :

-

-

-

-

-
NMSettingsConnectionInterfaceDeleteFunc ()

-
void                (*NMSettingsConnectionInterfaceDeleteFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :

-
error :

-
user_data :

-

-

-

-

-
NMSettingsConnectionInterfaceGetSecretsFunc ()

-
void                (*NMSettingsConnectionInterfaceGetSecretsFunc)
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :

-
secrets :

-
error :

-
user_data :

-

-

-

-

-
nm_settings_connection_interface_update ()

-
gboolean            nm_settings_connection_interface_update
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         NMSettingsConnectionInterfaceUpdateFunc callback,
-                                                         gpointer user_data);

-

-Update the connection with current settings and properties.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
an object implementing NMSettingsConnectionInterface
-
callback :
a function to be called when the update completes
-
user_data :
caller-specific data to be passed to callback
-
Returns :
 TRUE on success, FALSE on failure
-

-

-

-

-
nm_settings_connection_interface_delete ()

-
gboolean            nm_settings_connection_interface_delete
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         NMSettingsConnectionInterfaceDeleteFunc callback,
-                                                         gpointer user_data);

-

-Delete the connection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
a objecting implementing NMSettingsConnectionInterface
-
callback :
a function to be called when the delete completes
-
user_data :
caller-specific data to be passed to callback
-
Returns :
 TRUE on success, FALSE on failure
-

-

-

-

-
nm_settings_connection_interface_get_secrets ()

-
gboolean            nm_settings_connection_interface_get_secrets
-                                                        (NMSettingsConnectionInterface *connection,
-                                                         const char *setting_name,
-                                                         const char **hints,
-                                                         gboolean request_new,
-                                                         NMSettingsConnectionInterfaceGetSecretsFunc callback,
-                                                         gpointer user_data);

-

-Request the connection's secrets.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
a object implementing NMSettingsConnectionInterface
-
setting_name :
the NMSetting object name to get secrets for
-
hints :

-NMSetting key names to get secrets for (optional)
-
request_new :
hint that new secrets (instead of cached or stored secrets) 
- should be returned
-
callback :
a function to be called when the update completes
-
user_data :
caller-specific data to be passed to callback
-
Returns :
 TRUE on success, FALSE on failure
-

-

-

-

-
nm_settings_connection_interface_emit_updated ()

-
void                nm_settings_connection_interface_emit_updated
-                                                        (NMSettingsConnectionInterface *connection);

-

-

-

--
-
-
-
-


connection :

-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsService.html b/docs/libnm-glib/html/libnm-glib-NMSettingsService.html
deleted file mode 100644
index aca35d28..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsService.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-NMSettingsService
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMSettingsService

-
NMSettingsService

-

-

-
Synopsis

-
#define             NM_SETTINGS_SERVICE_BUS
-#define             NM_SETTINGS_SERVICE_SCOPE
-                    NMSettingsService;
-                    NMSettingsServiceClass;
-NMExportedConnection * nm_settings_service_get_connection_by_path
-                                                        (NMSettingsService *self,
-                                                         const char *path);
-void                nm_settings_service_export          (NMSettingsService *self);
-void                nm_settings_service_export_connection
-                                                        (NMSettingsService *self,
-                                                         NMSettingsConnectionInterface *exported);
-

-

-

-
Description

-

-

-

-

-
Details

-

-
NM_SETTINGS_SERVICE_BUS

-
#define NM_SETTINGS_SERVICE_BUS "bus"
-

-

-

-

-

-

-
NM_SETTINGS_SERVICE_SCOPE

-
#define NM_SETTINGS_SERVICE_SCOPE "scope"
-

-

-

-

-

-

-
NMSettingsService

-
typedef struct {
-	GObject parent;
-} NMSettingsService;
-

-

-

-

-

-

-
NMSettingsServiceClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Returned list must contain all NMExportedConnection objects exported
-	 * by the settings service.  The list (but not the NMExportedConnection
-	 * objects) will be freed by caller.
-	 */
-	GSList * (*list_connections) (NMSettingsService *self);
-
-	void (*add_connection) (NMSettingsService *self,
-	                        NMConnection *connection,
-	                        DBusGMethodInvocation *context, /* Only present for D-Bus calls */
-	                        NMSettingsAddConnectionFunc callback,
-	                        gpointer user_data);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSettingsServiceClass;
-

-

-

-

-

-

-
nm_settings_service_get_connection_by_path ()

-
NMExportedConnection * nm_settings_service_get_connection_by_path
-                                                        (NMSettingsService *self,
-                                                         const char *path);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


self :

-
path :

-
Returns :

-

-

-

-

-
nm_settings_service_export ()

-
void                nm_settings_service_export          (NMSettingsService *self);

-

-

-

--
-
-
-
-


self :

-

-

-

-

-
nm_settings_service_export_connection ()

-
void                nm_settings_service_export_connection
-                                                        (NMSettingsService *self,
-                                                         NMSettingsConnectionInterface *exported);

-

-

-

--
-
-
-
-
-
-
-
-
-
-


self :

-
exported :

-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html b/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html
deleted file mode 100644
index 1f096d90..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMSettingsSystem.html
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
-
-
-NMSettingsSystem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMSettingsSystem

-
NMSettingsSystem

-

-

-
Synopsis

-
enum                NMSettingsSystemPermissions;
-#define             NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME
-#define             NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY
-#define             NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS
-enum                NMSettingsSystemInterfaceProp;
-                    NMSettingsSystemInterface;
-void                (*NMSettingsSystemSaveHostnameFunc) (NMSettingsSystemInterface *settings,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMSettingsSystemGetPermissionsFunc)
-                                                        (NMSettingsSystemInterface *settings,
-                                                         NMSettingsSystemPermissions permissions,
-                                                         GError *error,
-                                                         gpointer user_data);
-gboolean            nm_settings_system_interface_save_hostname
-                                                        (NMSettingsSystemInterface *settings,
-                                                         const char *hostname,
-                                                         NMSettingsSystemSaveHostnameFunc callback,
-                                                         gpointer user_data);
-gboolean            nm_settings_system_interface_get_permissions
-                                                        (NMSettingsSystemInterface *settings,
-                                                         NMSettingsSystemGetPermissionsFunc callback,
-                                                         gpointer user_data);
-

-

-

-
Description

-

-

-

-

-
Details

-

-
enum NMSettingsSystemPermissions

-
typedef enum {
-	NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0,
-	NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1,
-	NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_PROTECTED = 0x2,
-	NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_OPEN = 0x4,
-	NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY = 0x8
-} NMSettingsSystemPermissions;
-

-

-

-

-

-

-
NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME

-
#define NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME          "hostname"
-

-

-

-

-

-

-
NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY

-
#define NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY        "can-modify"
-

-

-

-

-

-

-
NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS

-
#define NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS "check-permissions"
-

-

-

-

-

-

-
enum NMSettingsSystemInterfaceProp

-
typedef enum {
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST = 0x1000,
-
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME = NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST,
-	NM_SETTINGS_SYSTEM_INTERFACE_PROP_CAN_MODIFY
-} NMSettingsSystemInterfaceProp;
-

-

-

-

-

-

-
NMSettingsSystemInterface

-
typedef struct {
-	GTypeInterface g_iface;
-
-	/* Methods */
-	gboolean (*save_hostname) (NMSettingsSystemInterface *settings,
-	                           const char *hostname,
-	                           NMSettingsSystemSaveHostnameFunc callback,
-	                           gpointer user_data);
-
-	gboolean (*get_permissions) (NMSettingsSystemInterface *settings,
-	                             NMSettingsSystemGetPermissionsFunc callback,
-	                             gpointer user_data);
-
-	/* Signals */
-	void (*check_permissions) (NMSettingsSystemInterface *settings);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSettingsSystemInterface;
-

-

-

-

-

-

-
NMSettingsSystemSaveHostnameFunc ()

-
void                (*NMSettingsSystemSaveHostnameFunc) (NMSettingsSystemInterface *settings,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :

-
error :

-
user_data :

-

-

-

-

-
NMSettingsSystemGetPermissionsFunc ()

-
void                (*NMSettingsSystemGetPermissionsFunc)
-                                                        (NMSettingsSystemInterface *settings,
-                                                         NMSettingsSystemPermissions permissions,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :

-
permissions :

-
error :

-
user_data :

-

-

-

-

-
nm_settings_system_interface_save_hostname ()

-
gboolean            nm_settings_system_interface_save_hostname
-                                                        (NMSettingsSystemInterface *settings,
-                                                         const char *hostname,
-                                                         NMSettingsSystemSaveHostnameFunc callback,
-                                                         gpointer user_data);

-

-Requests that the machine's persistent hostname be set to the specified value
-or cleared.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :
a object implementing NMSettingsSystemInterface
-
hostname :
the new persistent hostname to set, or NULL to clear any existing
- persistent hostname
-
callback :
callback to be called when the hostname operation completes
-
user_data :
caller-specific data passed to callback
-
Returns :
 TRUE if the request was successful, FALSE if it failed
-

-

-

-

-
nm_settings_system_interface_get_permissions ()

-
gboolean            nm_settings_system_interface_get_permissions
-                                                        (NMSettingsSystemInterface *settings,
-                                                         NMSettingsSystemGetPermissionsFunc callback,
-                                                         gpointer user_data);

-

-Requests an indication of the operations the caller is permitted to perform
-including those that may require authorization.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


settings :
a object implementing NMSettingsSystemInterface
-
callback :
callback to be called when the permissions operation completes
-
user_data :
caller-specific data passed to callback
-
Returns :
 TRUE if the request was successful, FALSE if it failed
-

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index 136ad832..74a98981 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -5,17 +5,17 @@
 NMVPNPlugin
 
 
-
+
 
 
-
+
 
 
 
 
-
+
@@ -26,7 +26,7 @@
                   Description
-

+

 

 

 
@@ -35,7 +35,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 #define             NM_VPN_PLUGIN_STATE
@@ -60,14 +60,14 @@ enum                GError **err);
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

 
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 

@@ -75,7 +75,7 @@ enum                
+

 
NM_VPN_PLUGIN_STATE

 
#define NM_VPN_PLUGIN_STATE             "state"
 

@@ -83,7 +83,7 @@ enum                
+

 
enum NMVPNPluginError

 
typedef enum {
 	NM_VPN_PLUGIN_ERROR_GENERAL,
@@ -101,7 +101,7 @@ enum                
+

 
NM_VPN_PLUGIN_ERROR

 
#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
 

@@ -109,7 +109,7 @@ enum                
+

 
NM_TYPE_VPN_PLUGIN_ERROR

 
#define NM_TYPE_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_get_type ()) 
 

@@ -117,7 +117,7 @@ enum                
+

 
NMVPNPlugin

 
typedef struct {
 	GObject parent;
@@ -127,7 +127,7 @@ enum                
+

 
NMVPNPluginClass

 
typedef struct {
 	GObjectClass parent;
@@ -173,203 +173,77 @@ enum                
+

 
nm_vpn_plugin_error_quark ()

 
GQuark              nm_vpn_plugin_error_quark           (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_vpn_plugin_error_get_type ()

 
GType               nm_vpn_plugin_error_get_type        (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_vpn_plugin_get_connection ()

 
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_get_state ()

 
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_set_state ()

 
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
                                                          NMVPNServiceState state);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
state :

-

 

 

-

+

 
nm_vpn_plugin_set_login_banner ()

 
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
                                                          const char *banner);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
banner :

-

 

 

-

+

 
nm_vpn_plugin_failure ()

 
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
                                                          NMVPNPluginFailure reason);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
reason :

-

 

 

-

+

 
nm_vpn_plugin_set_ip4_config ()

 
void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip4_config);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


plugin :

-
ip4_config :

-

 

 

-

+

 
nm_vpn_plugin_disconnect ()

 
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
                                                          GError **err);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


plugin :

-
err :

-
Returns :

-

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
index 4716294e..d517644e 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
@@ -5,19 +5,20 @@
 NMVpnPluginUi
 
 
-
+
 
-
+
+
 
 
 
 
-
+
-
+
-

+

 

 

 
@@ -34,12 +35,10 @@
 
 
 

-

+

 
Synopsis

-
                    NMVpnPluginUiInterface;
-                    NMVpnPluginUiWidgetInterface;
-NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
 #define             NM_VPN_PLUGIN_UI_CAPABILITY_NONE
 #define             NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
 #define             NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
@@ -47,196 +46,68 @@
 #define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
 #define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
 enum                NMVpnPluginUiInterfaceProp;
-NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+struct              NMVpnPluginUiInterface;
+NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);
 guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                        (NMVpnPluginUiInterface *iface);
+NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
                                                          GError **error);
-gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);
 char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);
 gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);
 #define             NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
 #define             NM_VPN_PLUGIN_UI_WIDGET_INTERFACE   (obj)
 #define             NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)
 #define             NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE(obj)
+struct              NMVpnPluginUiWidgetInterface;
 GType               nm_vpn_plugin_ui_widget_interface_get_type
                                                         (void);
 GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
+                                                        (NMVpnPluginUiWidgetInterface *iface);
 gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);
 gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

-
NMVpnPluginUiInterface

-
typedef struct {
-	GTypeInterface g_iface;
-
-	/* Plugin's factory function that returns a GObject that implements
-	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
-	 * if non-NULL.
-	 */
-	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
-	                                              NMConnection *connection,
-	                                              GError **error);
-
-	/* Plugin's capabiltity function that returns a bitmask of capabilities
-	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
-	 */
-	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
-
-	/* Try to import a connection from the specified path.  On success, return a
-	 * partial NMConnection object.  On error, return NULL and set 'error' with
-	 * additional information.  Note that 'error' can be NULL, in which case no
-	 * additional error information should be provided.
-	 */
-	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
-	                                    const char *path,
-	                                    GError **error);
-
-	/* Export the given connection to the specified path.  Return TRUE on success.
-	 * On error, return FALSE and set 'error' with additional error information.
-	 * Note that 'error' can be NULL, in which case no additional error information
-	 * should be provided.
-	 */
-	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
-	                            const char *path,
-	                            NMConnection *connection,
-	                            GError **error);
-
-	/* For a given connection, return a suggested file name.  Returned value should
-	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
-	 * by the caller.
-	 */
-	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
-
-	/* Called when the user has chosen to remove the connection (for user
-	 * connections only; system connections are handled by the system
-	 * settings service).  Should clear out any VPN-specific secrets or data
-	 * related to the connection.
-	 */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMVpnPluginUiInterface;
-

-

-

-

-

-

-
NMVpnPluginUiWidgetInterface

-
typedef struct {
-	GTypeInterface g_iface;
-
-	/* Return the GtkWidget for the VPN's UI */
-	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
-
-	/* Called to save the user-entered options to the connection object.  Should
-	 * return FALSE and set 'error' if the current options are invalid.  'error'
-	 * should contain enough information for the plugin to determine which UI
-	 * widget is invalid at a later point in time.  For example, creating unique
-	 * error codes for what error occurred and populating the message field
-	 * of 'error' with the name of the invalid property.
-	 */
-	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
-	                               NMConnection *connection,
-	                               GError **error);
-
-	/* Called when the user has chosen to save the connection (for user
-	 * connections only; system connections are handled by the system
-	 * settings service).  Should save VPN-specific connection secrets in
-	 * a way that the auth-dialog can read them.
-	 */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
-	/* Emitted when the value of a UI widget changes.  May trigger a validity
-	 * check via update_connection() to write values to the connection */
-	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
-} NMVpnPluginUiWidgetInterface;
-

-

-

-

-

-

+

 
NMVpnPluginUiFactory ()

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


error :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_factory ()

-
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

+
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


error :

-
Returns :

-

 

 

-

+

 
NM_VPN_PLUGIN_UI_CAPABILITY_NONE

 
#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
 

@@ -244,7 +115,7 @@ enum                
+

 
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

 
#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT   0x01
 

@@ -252,7 +123,7 @@ enum                
+

 
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

 
#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT   0x02
 

@@ -260,7 +131,7 @@ enum                
+

 
NM_VPN_PLUGIN_UI_INTERFACE_NAME

 
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
 

@@ -268,7 +139,7 @@ enum                
+

 
NM_VPN_PLUGIN_UI_INTERFACE_DESC

 
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
 

@@ -276,7 +147,7 @@ enum                
+

 
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

 
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
 

@@ -284,7 +155,7 @@ enum                
+

 
enum NMVpnPluginUiInterfaceProp

 
typedef enum {
 	NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000,
@@ -298,203 +169,126 @@ enum                
+

+
struct NMVpnPluginUiInterface

+
struct NMVpnPluginUiInterface {
+	GTypeInterface g_iface;
+
+	/* Plugin's factory function that returns a GObject that implements
+	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
+	 * if non-NULL.
+	 */
+	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
+	                                              NMConnection *connection,
+	                                              GError **error);
+
+	/* Plugin's capabiltity function that returns a bitmask of capabilities
+	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
+	 */
+	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
+
+	/* Try to import a connection from the specified path.  On success, return a
+	 * partial NMConnection object.  On error, return NULL and set 'error' with
+	 * additional information.  Note that 'error' can be NULL, in which case no
+	 * additional error information should be provided.
+	 */
+	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
+	                                    const char *path,
+	                                    GError **error);
+
+	/* Export the given connection to the specified path.  Return TRUE on success.
+	 * On error, return FALSE and set 'error' with additional error information.
+	 * Note that 'error' can be NULL, in which case no additional error information
+	 * should be provided.
+	 */
+	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
+	                            const char *path,
+	                            NMConnection *connection,
+	                            GError **error);
+
+	/* For a given connection, return a suggested file name.  Returned value should
+	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
+	 * by the caller.
+	 */
+	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
+
+	/* Called when the user has chosen to remove the connection (for user
+	 * connections only; system connections are handled by the system
+	 * settings service).  Should clear out any VPN-specific secrets or data
+	 * related to the connection.
+	 */
+	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
+

+

+

+

+

+

 
nm_vpn_plugin_ui_interface_ui_factory ()

-
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
connection :

-
error :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_interface_get_capabilities ()

 
guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);

+                                                        (NMVpnPluginUiInterface *iface);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


iface :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
path :

-
error :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_interface_export ()

-
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
                                                          const char *path,
-                                                         NMConnection *connection,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
path :

-
connection :

-
error :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_interface_get_suggested_name ()

 
char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);

+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
connection :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_interface_delete_connection ()

 
gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
connection :

-
error :

-
Returns :

-

 

 

-

+

 
NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE

 
#define NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE      (nm_vpn_plugin_ui_widget_interface_get_type ())
 

@@ -502,166 +296,106 @@ enum                
+

 
NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()

 
#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
 

 

 

-

--
-
-
-
-


obj :

-

 

 

-

+

 
NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()

 
#define NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE))
 

 

 

-

--
-
-
-
-


obj :

-

 

 

-

+

 
NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()

 
#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
 

 

 

-

--
-
-
-
-


obj :

-

 

 

-

+

+
struct NMVpnPluginUiWidgetInterface

+
struct NMVpnPluginUiWidgetInterface {
+	GTypeInterface g_iface;
+
+	/* Return the GtkWidget for the VPN's UI */
+	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
+
+	/* Called to save the user-entered options to the connection object.  Should
+	 * return FALSE and set 'error' if the current options are invalid.  'error'
+	 * should contain enough information for the plugin to determine which UI
+	 * widget is invalid at a later point in time.  For example, creating unique
+	 * error codes for what error occurred and populating the message field
+	 * of 'error' with the name of the invalid property.
+	 */
+	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
+	                               NMConnection *connection,
+	                               GError **error);
+
+	/* Called when the user has chosen to save the connection (for user
+	 * connections only; system connections are handled by the system
+	 * settings service).  Should save VPN-specific connection secrets in
+	 * a way that the auth-dialog can read them.
+	 */
+	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
+	                          NMConnection *connection,
+	                          GError **error);
+
+	/* Emitted when the value of a UI widget changes.  May trigger a validity
+	 * check via update_connection() to write values to the connection */
+	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
+};
+

+

+

+

+

+

 
nm_vpn_plugin_ui_widget_interface_get_type ()

 
GType               nm_vpn_plugin_ui_widget_interface_get_type
                                                         (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_widget_interface_get_widget ()

 
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);

+                                                        (NMVpnPluginUiWidgetInterface *iface);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


iface :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_widget_interface_update_connection ()

 
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
connection :

-
error :

-
Returns :

-

 

 

-

+

 
nm_vpn_plugin_ui_widget_interface_save_secrets ()

 
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
                                                          GError **error);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


iface :

-
connection :

-
error :

-
Returns :

-

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index 51dcdb01..2f00ec53 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -5,20 +5,20 @@
 nm-types
 
 
-
-
-
-
+
+
+
+
 
 
 
 
-
-
+
+
-
+
-

+

 

 

 
@@ -35,7 +35,7 @@
 
 
 

-

+

 
Synopsis

 
#define             NM_TYPE_SSID
 GType               nm_ssid_get_type                    (void);
@@ -54,14 +54,14 @@
 GType               nm_ip6_route_object_array_get_type  (void);
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_TYPE_SSID

 
#define NM_TYPE_SSID  (nm_ssid_get_type ())
 

@@ -69,22 +69,14 @@
 

 

 

-

+

 
nm_ssid_get_type ()

 
GType               nm_ssid_get_type                    (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_UINT_ARRAY

 
#define NM_TYPE_UINT_ARRAY  (nm_uint_array_get_type ())
 

@@ -92,22 +84,14 @@
 

 

 

-

+

 
nm_uint_array_get_type ()

 
GType               nm_uint_array_get_type              (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_STRING_ARRAY

 
#define NM_TYPE_STRING_ARRAY  (nm_string_array_get_type ())
 

@@ -115,22 +99,14 @@
 

 

 

-

+

 
nm_string_array_get_type ()

 
GType               nm_string_array_get_type            (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_OBJECT_ARRAY

 
#define NM_TYPE_OBJECT_ARRAY  (nm_object_array_get_type ())
 

@@ -138,22 +114,14 @@
 

 

 

-

+

 
nm_object_array_get_type ()

 
GType               nm_object_array_get_type            (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY

 
#define NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY  (nm_ip6_address_object_array_get_type ())
 

@@ -161,23 +129,15 @@
 

 

 

-

+

 
nm_ip6_address_object_array_get_type ()

 
GType               nm_ip6_address_object_array_get_type
                                                         (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_IP6_ADDRESS_ARRAY

 
#define NM_TYPE_IP6_ADDRESS_ARRAY  (nm_ip6_address_array_get_type ())
 

@@ -185,22 +145,14 @@
 

 

 

-

+

 
nm_ip6_address_array_get_type ()

 
GType               nm_ip6_address_array_get_type       (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_TYPE_IP6_ROUTE_OBJECT_ARRAY

 
#define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY  (nm_ip6_route_object_array_get_type ())
 

@@ -208,24 +160,16 @@
 

 

 

-

+

 
nm_ip6_route_object_array_get_type ()

 
GType               nm_ip6_route_object_array_get_type  (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp b/docs/libnm-glib/html/libnm-glib.devhelp
index 28707b00..784eca14 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp
+++ b/docs/libnm-glib/html/libnm-glib.devhelp
@@ -1,38 +1,38 @@
 
 
-
+
   
-    
+    
+    
       
       
       
       
       
-      
-      
-      
+      
       
+      
+      
       
       
       
       
       
-      
       
       
       
-      
-      
-      
-      
-      
       
+      
       
       
       
     
+    
+    
+    
   
   
+    
     
     
     
@@ -40,6 +40,8 @@
     
     
     
+    
+    
     
     
     
@@ -48,8 +50,10 @@
     
     
     
-    
+    
     
+    
+    
     
     
     
@@ -59,6 +63,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -68,6 +76,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -75,8 +86,8 @@
     
     
     
-    
     
+    
     
     
     
@@ -85,9 +96,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -97,9 +107,9 @@
     
     
     
-    
     
     
+    
     
     
     
@@ -119,6 +129,7 @@
     
     
     
+    
     
     
     
@@ -133,7 +144,10 @@
     
     
     
+    
+    
     
+    
     
     
     
@@ -188,17 +202,14 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -211,15 +222,59 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
+    
     
-    
     
     
     
+    
     
     
     
@@ -227,11 +282,15 @@
     
     
     
+    
     
-    
     
     
     
+    
+    
+    
+    
     
     
     
@@ -244,21 +303,18 @@
     
     
     
-    
     
     
     
     
     
     
-    
     
     
     
     
     
     
-    
     
     
     
@@ -291,9 +347,6 @@
     
     
     
-    
-    
-    
     
     
     
@@ -302,62 +355,49 @@
     
     
     
+    
+    
     
     
+    
+    
+    
     
+    
+    
+    
     
     
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
     
@@ -372,6 +412,28 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -398,8 +460,6 @@
     
     
     
-    
-    
     
     
     
@@ -409,6 +469,7 @@
     
     
     
+    
     
     
     
@@ -419,6 +480,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index a3b30798..4cc1d64b 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -1,38 +1,38 @@
 
 
-
+
   
-    
+    
+    
       
       
       
       
       
-      
-      
-      
+      
       
+      
+      
       
       
       
       
       
-      
       
       
       
-      
-      
-      
-      
-      
       
+      
       
       
       
     
+    
+    
+    
   
   
+    
     
     
     
@@ -40,6 +40,8 @@
     
     
     
+    
+    
     
     
     
@@ -48,8 +50,10 @@
     
     
     
-    
+    
     
+    
+    
     
     
     
@@ -59,6 +63,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -68,6 +76,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -75,8 +86,8 @@
     
     
     
-    
     
+    
     
     
     
@@ -85,9 +96,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -97,9 +107,9 @@
     
     
     
-    
     
     
+    
     
     
     
@@ -119,6 +129,7 @@
     
     
     
+    
     
     
     
@@ -133,7 +144,10 @@
     
     
     
+    
+    
     
+    
     
     
     
@@ -188,17 +202,14 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -211,15 +222,59 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
+    
     
-    
     
     
     
+    
     
     
     
@@ -227,11 +282,15 @@
     
     
     
+    
     
-    
     
     
     
+    
+    
+    
+    
     
     
     
@@ -244,21 +303,18 @@
     
     
     
-    
     
     
     
     
     
     
-    
     
     
     
     
     
     
-    
     
     
     
@@ -291,9 +347,6 @@
     
     
     
-    
-    
-    
     
     
     
@@ -302,62 +355,49 @@
     
     
     
+    
+    
     
     
+    
+    
+    
     
+    
+    
+    
     
     
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
     
@@ -372,6 +412,28 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -398,8 +460,6 @@
     
     
     
-    
-    
     
     
     
@@ -409,6 +469,7 @@
     
     
     
+    
     
     
     
@@ -419,9 +480,16 @@
     
     
     
+    
     
     
     
     
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/libnm-glib.png b/docs/libnm-glib/html/libnm-glib.png
new file mode 100644
index 00000000..dc000728
Binary files /dev/null and b/docs/libnm-glib/html/libnm-glib.png differ
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
new file mode 100644
index 00000000..1ebe1369
--- /dev/null
+++ b/docs/libnm-glib/html/object-tree.html
@@ -0,0 +1,53 @@
+
+
+
+
+Object Hierarchy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Object Hierarchy

+
+    GObject
+        NMObject
+            NMClient
+            NMDevice
+                NMDeviceEthernet
+                NMDeviceWifi
+                NMDeviceModem
+                NMDeviceBt
+                NMDeviceWimax
+            NMWimaxNsp
+            NMAccessPoint
+            NMIP4Config
+            NMIP6Config
+            NMActiveConnection
+                NMVPNConnection
+            NMDHCP4Config
+            NMDHCP6Config
+        NMRemoteSettings
+        NMConnection
+            NMRemoteConnection
+        NMSecretAgent
+

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
new file mode 100644
index 00000000..9465073b
--- /dev/null
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -0,0 +1,47 @@
+
+
+
+
+Object Overview
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Object Overview

+

+      libnm-glib maps closely to the actual D-Bus API that NetworkManager
+      provides, simply wrapping the remote D-Bus objects as native GObjects,
+      mapping D-Bus signals and properties to GObject signals and properties,
+      and providing helpful accessor and utility functions.  As such, objects
+      in the libnm-glib API have the same properties, behavior, signals, and
+      semantics as the NM D-Bus API.
+    

+

+      The following is a rough overview of the libnm-glib object structure and
+      how to use the various parts of it:
+      

+

+
+

+

+    

+

+

+

+          Generated by GTK-Doc V1.17

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/style.css b/docs/libnm-glib/html/style.css
index d544a2c2..d6f6c26e 100644
--- a/docs/libnm-glib/html/style.css
+++ b/docs/libnm-glib/html/style.css
@@ -32,8 +32,9 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
+    display: inline-block;
     position: relative;
-    padding-top:4.5em;
+    top:-5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
diff --git a/docs/libnm-glib/libnm-glib-docs.sgml b/docs/libnm-glib/libnm-glib-docs.sgml
deleted file mode 100644
index b4e5dac2..00000000
--- a/docs/libnm-glib/libnm-glib-docs.sgml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-  
-    libnm-glib Reference Manual
-    
-      for libnm-glib 0.8
-      The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/.
-    
-  
-
-  
-    libnm-glib Objects
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
new file mode 100644
index 00000000..533010e1
--- /dev/null
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -0,0 +1,118 @@
+
+
+
+  
+    libnm-glib Reference Manual
+    
+      for libnm-glib 0.9
+      The latest version of this documentation can be found on-line at
+      http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
+    
+    
+      
+	Dan
+	Williams
+	
+	  

+	    dcbw@redhat.com
+	  

+	
+      
+    
+
+    
+      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
+	version published by the Free Software Foundation with no
+	Invariant Sections, no Front-Cover Texts, and no Back-Cover
+	Texts. You may obtain a copy of the GNU Free
+	Documentation License from the Free Software
+	Foundation by visiting their Web site or by writing
+	to:
+
+	

+	  The Free Software Foundation, Inc.,
+	  59 Temple Place - Suite 330,
+	  Boston, MA 02111-1307,
+	  USA
+	

+      
+
+      
+	Many of the names used by companies to distinguish their
+	products and services are claimed as trademarks. Where those
+	names appear in any GNOME documentation, and those trademarks
+	are made aware to the members of the GNOME Documentation
+	Project, the names have been printed in caps or initial caps.
+      
+    
+  
+
+  
+    Object Overview
+    
+      libnm-glib maps closely to the actual D-Bus API that NetworkManager
+      provides, simply wrapping the remote D-Bus objects as native GObjects,
+      mapping D-Bus signals and properties to GObject signals and properties,
+      and providing helpful accessor and utility functions.  As such, objects
+      in the libnm-glib API have the same properties, behavior, signals, and
+      semantics as the NM D-Bus API.
+    
+    
+      The following is a rough overview of the libnm-glib object structure and
+      how to use the various parts of it:
+      
+        
+          
+        
+      
+    
+  
+
+  
+    libnm-glib API Reference
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
+  
+    Object Hierarchy
+     
+  
+  
+    API Index
+    
+  
+
+  
+
+
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index a585d42c..71910fd5 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -1,70 +1,8 @@
-

-nm-exported-connection
-NMExportedConnection
-NMExportedConnection
-NMExportedConnectionClass
-nm_exported_connection_new
-
-NM_EXPORTED_CONNECTION
-NM_IS_EXPORTED_CONNECTION
-NM_TYPE_EXPORTED_CONNECTION
-nm_exported_connection_get_type
-NM_EXPORTED_CONNECTION_CLASS
-NM_IS_EXPORTED_CONNECTION_CLASS
-NM_EXPORTED_CONNECTION_GET_CLASS
-

-
-

-nm-device
-NMDevice
-NM_DEVICE_UDI
-NM_DEVICE_INTERFACE
-NM_DEVICE_IP_INTERFACE
-NM_DEVICE_DRIVER
-NM_DEVICE_CAPABILITIES
-NM_DEVICE_MANAGED
-NM_DEVICE_FIRMWARE_MISSING
-NM_DEVICE_IP4_CONFIG
-NM_DEVICE_DHCP4_CONFIG
-NM_DEVICE_IP6_CONFIG
-NM_DEVICE_DHCP6_CONFIG
-NM_DEVICE_STATE
-NM_DEVICE_VENDOR
-NM_DEVICE_PRODUCT
-NMDevice
-NMDeviceClass
-nm_device_new
-nm_device_get_iface
-nm_device_get_ip_iface
-nm_device_get_udi
-nm_device_get_driver
-nm_device_get_capabilities
-nm_device_get_managed
-nm_device_get_firmware_missing
-nm_device_get_ip4_config
-nm_device_get_dhcp4_config
-nm_device_get_ip6_config
-nm_device_get_dhcp6_config
-nm_device_get_state
-nm_device_get_product
-nm_device_get_vendor
-NMDeviceDeactivateFn
-nm_device_disconnect
-
-NM_DEVICE
-NM_IS_DEVICE
-NM_TYPE_DEVICE
-nm_device_get_type
-NM_DEVICE_CLASS
-NM_IS_DEVICE_CLASS
-NM_DEVICE_GET_CLASS
-

-
 

 nm-active-connection
 NMActiveConnection
-NM_ACTIVE_CONNECTION_SERVICE_NAME
 NM_ACTIVE_CONNECTION_CONNECTION
+NM_ACTIVE_CONNECTION_UUID
 NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
 NM_ACTIVE_CONNECTION_DEVICES
 NM_ACTIVE_CONNECTION_STATE
@@ -73,9 +11,8 @@ NM_ACTIVE_CONNECTION_DEFAULT6
 NMActiveConnection
 NMActiveConnectionClass
 nm_active_connection_new
-nm_active_connection_get_service_name
-nm_active_connection_get_scope
 nm_active_connection_get_connection
+nm_active_connection_get_uuid
 nm_active_connection_get_specific_object
 nm_active_connection_get_devices
 nm_active_connection_get_state
@@ -91,182 +28,70 @@ NM_IS_ACTIVE_CONNECTION_CLASS
 NM_ACTIVE_CONNECTION_GET_CLASS
 

 
-

-nm-access-point
-NMAccessPoint
-NM_ACCESS_POINT_FLAGS
-NM_ACCESS_POINT_WPA_FLAGS
-NM_ACCESS_POINT_RSN_FLAGS
-NM_ACCESS_POINT_SSID
-NM_ACCESS_POINT_FREQUENCY
-NM_ACCESS_POINT_HW_ADDRESS
-NM_ACCESS_POINT_MODE
-NM_ACCESS_POINT_MAX_BITRATE
-NM_ACCESS_POINT_STRENGTH
-NMAccessPoint
-NMAccessPointClass
-nm_access_point_new
-nm_access_point_get_flags
-nm_access_point_get_wpa_flags
-nm_access_point_get_rsn_flags
-nm_access_point_get_ssid
-nm_access_point_get_frequency
-nm_access_point_get_hw_address
-nm_access_point_get_mode
-nm_access_point_get_max_bitrate
-nm_access_point_get_strength
-
-NM_ACCESS_POINT
-NM_IS_ACCESS_POINT
-NM_TYPE_ACCESS_POINT
-nm_access_point_get_type
-NM_ACCESS_POINT_CLASS
-NM_IS_ACCESS_POINT_CLASS
-NM_ACCESS_POINT_GET_CLASS
-

-
-

-nm-vpn-connection
-NMVPNConnection
-NM_VPN_CONNECTION_VPN_STATE
-NM_VPN_CONNECTION_BANNER
-NMVPNConnection
-NMVPNConnectionClass
-nm_vpn_connection_new
-nm_vpn_connection_get_vpn_state
-nm_vpn_connection_get_banner
-
-NM_VPN_CONNECTION
-NM_IS_VPN_CONNECTION
-NM_TYPE_VPN_CONNECTION
-nm_vpn_connection_get_type
-NM_VPN_CONNECTION_CLASS
-NM_IS_VPN_CONNECTION_CLASS
-NM_VPN_CONNECTION_GET_CLASS
-

-
-

-nm-settings-connection-interface
-NMSettingsConnection
-NM_SETTINGS_CONNECTION_INTERFACE_UPDATED
-NM_SETTINGS_CONNECTION_INTERFACE_REMOVED
-NMSettingsConnectionInterface
-NMSettingsConnectionInterfaceUpdateFunc
-NMSettingsConnectionInterfaceDeleteFunc
-NMSettingsConnectionInterfaceGetSecretsFunc
-nm_settings_connection_interface_update
-nm_settings_connection_interface_delete
-nm_settings_connection_interface_get_secrets
-nm_settings_connection_interface_emit_updated
-
-NM_SETTINGS_CONNECTION_INTERFACE
-NM_IS_SETTINGS_CONNECTION_INTERFACE
-NM_TYPE_SETTINGS_CONNECTION_INTERFACE
-nm_settings_connection_interface_get_type
-NM_SETTINGS_CONNECTION_INTERFACE_GET_INTERFACE
-

-
-

-nm-ip4-config
-NMIP4Config
-NMIP4Config
-NMIP4ConfigClass
-NM_IP4_CONFIG_ADDRESSES
-NM_IP4_CONFIG_HOSTNAME
-NM_IP4_CONFIG_NAMESERVERS
-NM_IP4_CONFIG_DOMAINS
-NM_IP4_CONFIG_ROUTES
-NM_IP4_CONFIG_WINS_SERVERS
-nm_ip4_config_new
-nm_ip4_config_get_addresses
-nm_ip4_config_get_hostname
-nm_ip4_config_get_nameservers
-nm_ip4_config_get_domains
-nm_ip4_config_get_routes
-nm_ip4_config_get_wins_servers
-
-NM_IP4_CONFIG
-NM_IS_IP4_CONFIG
-NM_TYPE_IP4_CONFIG
-nm_ip4_config_get_type
-NM_IP4_CONFIG_CLASS
-NM_IS_IP4_CONFIG_CLASS
-NM_IP4_CONFIG_GET_CLASS
-

-
 

 nm-remote-settings
 NMRemoteSettings
+NMRemoteSettingsError
+NM_TYPE_REMOTE_SETTINGS_ERROR
+NM_REMOTE_SETTINGS_ERROR
+nm_remote_settings_error_quark
 NM_REMOTE_SETTINGS_BUS
-NM_REMOTE_SETTINGS_SCOPE
 NM_REMOTE_SETTINGS_SERVICE_RUNNING
+NM_REMOTE_SETTINGS_HOSTNAME
+NM_REMOTE_SETTINGS_CAN_MODIFY
+NM_REMOTE_SETTINGS_NEW_CONNECTION
+NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NMRemoteSettingsAddConnectionFunc
+NMRemoteSettingsSaveHostnameFunc
 NMRemoteSettings
 NMRemoteSettingsClass
+nm_remote_settings_get_type
 nm_remote_settings_new
+nm_remote_settings_list_connections
+nm_remote_settings_get_connection_by_path
+nm_remote_settings_get_connection_by_uuid
+nm_remote_settings_add_connection
+nm_remote_settings_save_hostname
 
 NM_REMOTE_SETTINGS
 NM_IS_REMOTE_SETTINGS
 NM_TYPE_REMOTE_SETTINGS
-nm_remote_settings_get_type
+nm_remote_settings_error_get_type
 NM_REMOTE_SETTINGS_CLASS
 NM_IS_REMOTE_SETTINGS_CLASS
 NM_REMOTE_SETTINGS_GET_CLASS
 

 
 

-nm-ip6-config
-NMIP6Config
-NMIP6Config
-NMIP6ConfigClass
-NM_IP6_CONFIG_ADDRESSES
-NM_IP6_CONFIG_NAMESERVERS
-NM_IP6_CONFIG_DOMAINS
-NM_IP6_CONFIG_ROUTES
-nm_ip6_config_new
-nm_ip6_config_get_addresses
-nm_ip6_config_get_nameservers
-nm_ip6_config_get_domains
-nm_ip6_config_get_routes
-
-NM_IP6_CONFIG
-NM_IS_IP6_CONFIG
-NM_TYPE_IP6_CONFIG
-nm_ip6_config_get_type
-NM_IP6_CONFIG_CLASS
-NM_IS_IP6_CONFIG_CLASS
-NM_IP6_CONFIG_GET_CLASS
-

-
-

-nm-remote-settings-system
-NMRemoteSettingsSystem
-NMRemoteSettingsSystem
-NMRemoteSettingsSystemClass
-nm_remote_settings_system_new
-
-NM_REMOTE_SETTINGS_SYSTEM
-NM_IS_REMOTE_SETTINGS_SYSTEM
-NM_TYPE_REMOTE_SETTINGS_SYSTEM
-nm_remote_settings_system_get_type
-NM_REMOTE_SETTINGS_SYSTEM_CLASS
-NM_IS_REMOTE_SETTINGS_SYSTEM_CLASS
-NM_REMOTE_SETTINGS_SYSTEM_GET_CLASS
-

-
-

-nm-cdma-device
-NMCdmaDevice
-NMCdmaDevice
-NMCdmaDeviceClass
-nm_cdma_device_new
+nm-device-wimax
+NMDeviceWimax
+NM_DEVICE_WIMAX_HW_ADDRESS
+NM_DEVICE_WIMAX_ACTIVE_NSP
+NM_DEVICE_WIMAX_CENTER_FREQUENCY
+NM_DEVICE_WIMAX_RSSI
+NM_DEVICE_WIMAX_CINR
+NM_DEVICE_WIMAX_TX_POWER
+NM_DEVICE_WIMAX_BSID
+NMDeviceWimax
+NMDeviceWimaxClass
+nm_device_wimax_new
+nm_device_wimax_get_hw_address
+nm_device_wimax_get_active_nsp
+nm_device_wimax_get_nsp_by_path
+nm_device_wimax_get_nsps
+nm_device_wimax_get_center_frequency
+nm_device_wimax_get_rssi
+nm_device_wimax_get_cinr
+nm_device_wimax_get_tx_power
+nm_device_wimax_get_bsid
 
-NM_CDMA_DEVICE
-NM_IS_CDMA_DEVICE
-NM_TYPE_CDMA_DEVICE
-nm_cdma_device_get_type
-NM_CDMA_DEVICE_CLASS
-NM_IS_CDMA_DEVICE_CLASS
-NM_CDMA_DEVICE_GET_CLASS
+NM_DEVICE_WIMAX
+NM_IS_DEVICE_WIMAX
+NM_TYPE_DEVICE_WIMAX
+nm_device_wimax_get_type
+NM_DEVICE_WIMAX_CLASS
+NM_IS_DEVICE_WIMAX_CLASS
+NM_DEVICE_WIMAX_GET_CLASS
 

 
 

@@ -300,21 +125,215 @@ NM_DEVICE_WIFI_GET_CLASS
 

 
 

-nm-dhcp4-config
-NMDHCP4Config
-NMDHCP4Config
-NMDHCP4ConfigClass
-NM_DHCP4_CONFIG_OPTIONS
-nm_dhcp4_config_new
-nm_dhcp4_config_get_options
-nm_dhcp4_config_get_one_option
+nm-dhcp6-config
+NMDHCP6Config
+NMDHCP6Config
+NMDHCP6ConfigClass
+NM_DHCP6_CONFIG_OPTIONS
+nm_dhcp6_config_new
+nm_dhcp6_config_get_options
+nm_dhcp6_config_get_one_option
 
-NM_DHCP4_CONFIG
-NM_IS_DHCP4_CONFIG
-NM_TYPE_DHCP4_CONFIG
-nm_dhcp4_config_get_type
-NM_DHCP4_CONFIG_CLASS
-NM_IS_DHCP4_CONFIG_CLASS
+NM_DHCP6_CONFIG
+NM_IS_DHCP6_CONFIG
+NM_TYPE_DHCP6_CONFIG
+nm_dhcp6_config_get_type
+NM_DHCP6_CONFIG_CLASS
+NM_IS_DHCP6_CONFIG_CLASS
+

+
+

+nm-object
+NMObject
+NM_OBJECT_DBUS_CONNECTION
+NM_OBJECT_DBUS_PATH
+NMObject
+NMObjectClass
+nm_object_get_connection
+nm_object_get_path
+
+NM_OBJECT
+NM_IS_OBJECT
+NM_TYPE_OBJECT
+nm_object_get_type
+NM_OBJECT_CLASS
+NM_IS_OBJECT_CLASS
+NM_OBJECT_GET_CLASS
+

+
+

+nm-secret-agent
+NMSecretAgent
+NM_SECRET_AGENT_ERROR
+NM_TYPE_SECRET_AGENT_ERROR
+nm_secret_agent_error_quark
+NMSecretAgentError
+NMSecretAgentGetSecretsFlags
+NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_AUTO_REGISTER
+NM_SECRET_AGENT_REGISTRATION_RESULT
+NMSecretAgent
+NMSecretAgentGetSecretsFunc
+NMSecretAgentSaveSecretsFunc
+NMSecretAgentDeleteSecretsFunc
+NMSecretAgentClass
+nm_secret_agent_get_type
+nm_secret_agent_register
+nm_secret_agent_unregister
+nm_secret_agent_get_secrets
+nm_secret_agent_save_secrets
+nm_secret_agent_delete_secrets
+
+NM_SECRET_AGENT
+NM_IS_SECRET_AGENT
+NM_TYPE_SECRET_AGENT
+nm_secret_agent_error_get_type
+NM_SECRET_AGENT_CLASS
+NM_IS_SECRET_AGENT_CLASS
+NM_SECRET_AGENT_GET_CLASS
+

+
+

+nm-ip4-config
+NMIP4Config
+NMIP4Config
+NMIP4ConfigClass
+NM_IP4_CONFIG_ADDRESSES
+NM_IP4_CONFIG_NAMESERVERS
+NM_IP4_CONFIG_DOMAINS
+NM_IP4_CONFIG_ROUTES
+NM_IP4_CONFIG_WINS_SERVERS
+nm_ip4_config_new
+nm_ip4_config_get_addresses
+nm_ip4_config_get_nameservers
+nm_ip4_config_get_domains
+nm_ip4_config_get_routes
+nm_ip4_config_get_wins_servers
+
+NM_IP4_CONFIG
+NM_IS_IP4_CONFIG
+NM_TYPE_IP4_CONFIG
+nm_ip4_config_get_type
+NM_IP4_CONFIG_CLASS
+NM_IS_IP4_CONFIG_CLASS
+NM_IP4_CONFIG_GET_CLASS
+

+
+

+nm-vpn-plugin
+NMVPNPlugin
+NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+NM_VPN_PLUGIN_STATE
+NMVPNPluginError
+NM_VPN_PLUGIN_ERROR
+NM_TYPE_VPN_PLUGIN_ERROR
+NMVPNPlugin
+NMVPNPluginClass
+nm_vpn_plugin_error_quark
+nm_vpn_plugin_error_get_type
+nm_vpn_plugin_get_connection
+nm_vpn_plugin_get_state
+nm_vpn_plugin_set_state
+nm_vpn_plugin_set_login_banner
+nm_vpn_plugin_failure
+nm_vpn_plugin_set_ip4_config
+nm_vpn_plugin_disconnect
+
+NM_VPN_PLUGIN
+NM_IS_VPN_PLUGIN
+NM_TYPE_VPN_PLUGIN
+nm_vpn_plugin_get_type
+NM_VPN_PLUGIN_CLASS
+NM_IS_VPN_PLUGIN_CLASS
+NM_VPN_PLUGIN_GET_CLASS
+

+
+

+nm-access-point
+NMAccessPoint
+NM_ACCESS_POINT_FLAGS
+NM_ACCESS_POINT_WPA_FLAGS
+NM_ACCESS_POINT_RSN_FLAGS
+NM_ACCESS_POINT_SSID
+NM_ACCESS_POINT_BSSID
+NM_ACCESS_POINT_FREQUENCY
+NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_MAX_BITRATE
+NM_ACCESS_POINT_STRENGTH
+NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
+NMAccessPointClass
+nm_access_point_new
+nm_access_point_get_flags
+nm_access_point_get_wpa_flags
+nm_access_point_get_rsn_flags
+nm_access_point_get_ssid
+nm_access_point_get_bssid
+nm_access_point_get_frequency
+nm_access_point_get_mode
+nm_access_point_get_max_bitrate
+nm_access_point_get_strength
+nm_access_point_filter_connections
+nm_access_point_connection_valid
+nm_access_point_get_hw_address
+
+NM_ACCESS_POINT
+NM_IS_ACCESS_POINT
+NM_TYPE_ACCESS_POINT
+nm_access_point_get_type
+NM_ACCESS_POINT_CLASS
+NM_IS_ACCESS_POINT_CLASS
+NM_ACCESS_POINT_GET_CLASS
+

+
+

+nm-device
+NMDevice
+NM_DEVICE_DEVICE_TYPE
+NM_DEVICE_UDI
+NM_DEVICE_INTERFACE
+NM_DEVICE_IP_INTERFACE
+NM_DEVICE_DRIVER
+NM_DEVICE_CAPABILITIES
+NM_DEVICE_MANAGED
+NM_DEVICE_FIRMWARE_MISSING
+NM_DEVICE_IP4_CONFIG
+NM_DEVICE_DHCP4_CONFIG
+NM_DEVICE_IP6_CONFIG
+NM_DEVICE_DHCP6_CONFIG
+NM_DEVICE_STATE
+NM_DEVICE_VENDOR
+NM_DEVICE_PRODUCT
+NMDevice
+NMDeviceClass
+nm_device_new
+nm_device_get_iface
+nm_device_get_ip_iface
+nm_device_get_device_type
+nm_device_get_udi
+nm_device_get_driver
+nm_device_get_capabilities
+nm_device_get_managed
+nm_device_get_firmware_missing
+nm_device_get_ip4_config
+nm_device_get_dhcp4_config
+nm_device_get_ip6_config
+nm_device_get_dhcp6_config
+nm_device_get_state
+nm_device_get_product
+nm_device_get_vendor
+NMDeviceDeactivateFn
+nm_device_disconnect
+nm_device_filter_connections
+nm_device_connection_valid
+
+NM_DEVICE
+NM_IS_DEVICE
+NM_TYPE_DEVICE
+nm_device_get_type
+NM_DEVICE_CLASS
+NM_IS_DEVICE_CLASS
+NM_DEVICE_GET_CLASS
 

 
 

@@ -342,105 +361,29 @@ NM_DEVICE_ETHERNET_GET_CLASS
 

 
 

-nm-dhcp6-config
-NMDHCP6Config
-NMDHCP6Config
-NMDHCP6ConfigClass
-NM_DHCP6_CONFIG_OPTIONS
-nm_dhcp6_config_new
-nm_dhcp6_config_get_options
-nm_dhcp6_config_get_one_option
-
-NM_DHCP6_CONFIG
-NM_IS_DHCP6_CONFIG
-NM_TYPE_DHCP6_CONFIG
-nm_dhcp6_config_get_type
-NM_DHCP6_CONFIG_CLASS
-NM_IS_DHCP6_CONFIG_CLASS
-

-
-

-nm-client
-NMClient
-NM_CLIENT_STATE
-NM_CLIENT_MANAGER_RUNNING
-NM_CLIENT_NETWORKING_ENABLED
-NM_CLIENT_WIRELESS_ENABLED
-NM_CLIENT_WIRELESS_HARDWARE_ENABLED
-NM_CLIENT_WWAN_ENABLED
-NM_CLIENT_WWAN_HARDWARE_ENABLED
-NM_CLIENT_ACTIVE_CONNECTIONS
-NMClientPermission
-NMClientPermissionResult
-NMClient
-NMClientClass
-nm_client_new
-nm_client_get_devices
-nm_client_get_device_by_path
-NMClientActivateDeviceFn
-nm_client_activate_connection
-nm_client_deactivate_connection
-nm_client_networking_get_enabled
-nm_client_networking_set_enabled
-nm_client_wireless_get_enabled
-nm_client_wireless_set_enabled
-nm_client_wireless_hardware_get_enabled
-nm_client_wwan_get_enabled
-nm_client_wwan_set_enabled
-nm_client_wwan_hardware_get_enabled
-nm_client_get_state
-nm_client_get_manager_running
-nm_client_get_active_connections
-nm_client_sleep
-nm_client_get_permission_result
-
-NM_CLIENT
-NM_IS_CLIENT
-NM_TYPE_CLIENT
-nm_client_get_type
-NM_CLIENT_CLASS
-NM_IS_CLIENT_CLASS
-NM_CLIENT_GET_CLASS
-

-
-

-nm-remote-connection
-NMRemoteConnection
-NMRemoteConnection
-NMRemoteConnectionClass
-nm_remote_connection_new
-
-NM_REMOTE_CONNECTION
-NM_IS_REMOTE_CONNECTION
-NM_TYPE_REMOTE_CONNECTION
-nm_remote_connection_get_type
-NM_REMOTE_CONNECTION_CLASS
-NM_IS_REMOTE_CONNECTION_CLASS
-NM_REMOTE_CONNECTION_GET_CLASS
-

-
-

-nm-gsm-device
-NMGsmDevice
-NMGsmDevice
-NMGsmDeviceClass
-nm_gsm_device_new
+nm-vpn-connection
+NMVPNConnection
+NM_VPN_CONNECTION_VPN_STATE
+NM_VPN_CONNECTION_BANNER
+NMVPNConnection
+NMVPNConnectionClass
+nm_vpn_connection_new
+nm_vpn_connection_get_vpn_state
+nm_vpn_connection_get_banner
 
-NM_GSM_DEVICE
-NM_IS_GSM_DEVICE
-NM_TYPE_GSM_DEVICE
-nm_gsm_device_get_type
-NM_GSM_DEVICE_CLASS
-NM_IS_GSM_DEVICE_CLASS
-NM_GSM_DEVICE_GET_CLASS
+NM_VPN_CONNECTION
+NM_IS_VPN_CONNECTION
+NM_TYPE_VPN_CONNECTION
+nm_vpn_connection_get_type
+NM_VPN_CONNECTION_CLASS
+NM_IS_VPN_CONNECTION_CLASS
+NM_VPN_CONNECTION_GET_CLASS
 

 
 

 nm-vpn-plugin-ui-interface
 NMVpnPluginUiWidget
 NMVpnPluginUi
-NMVpnPluginUiInterface
-NMVpnPluginUiWidgetInterface
 NMVpnPluginUiFactory
 nm_vpn_plugin_ui_factory
 NM_VPN_PLUGIN_UI_CAPABILITY_NONE
@@ -450,6 +393,7 @@ NM_VPN_PLUGIN_UI_INTERFACE_NAME
 NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
 NMVpnPluginUiInterfaceProp
+NMVpnPluginUiInterface
 nm_vpn_plugin_ui_interface_ui_factory
 nm_vpn_plugin_ui_interface_get_capabilities
 nm_vpn_plugin_ui_interface_import
@@ -460,6 +404,7 @@ NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE
+NMVpnPluginUiWidgetInterface
 nm_vpn_plugin_ui_widget_interface_get_type
 nm_vpn_plugin_ui_widget_interface_get_widget
 nm_vpn_plugin_ui_widget_interface_update_connection
@@ -473,109 +418,71 @@ NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE
 

 
 

-nm-vpn-plugin
-NMVPNPlugin
-NM_VPN_PLUGIN_DBUS_SERVICE_NAME
-NM_VPN_PLUGIN_STATE
-NMVPNPluginError
-NM_VPN_PLUGIN_ERROR
-NM_TYPE_VPN_PLUGIN_ERROR
-NMVPNPlugin
-NMVPNPluginClass
-nm_vpn_plugin_error_quark
-nm_vpn_plugin_error_get_type
-nm_vpn_plugin_get_connection
-nm_vpn_plugin_get_state
-nm_vpn_plugin_set_state
-nm_vpn_plugin_set_login_banner
-nm_vpn_plugin_failure
-nm_vpn_plugin_set_ip4_config
-nm_vpn_plugin_disconnect
-
-NM_VPN_PLUGIN
-NM_IS_VPN_PLUGIN
-NM_TYPE_VPN_PLUGIN
-nm_vpn_plugin_get_type
-NM_VPN_PLUGIN_CLASS
-NM_IS_VPN_PLUGIN_CLASS
-NM_VPN_PLUGIN_GET_CLASS
-

-
-

-nm-serial-device
-NMSerialDevice
-NMSerialDevice
-NMSerialDeviceClass
-nm_serial_device_get_bytes_received
-nm_serial_device_get_bytes_sent
-
-NM_SERIAL_DEVICE
-NM_IS_SERIAL_DEVICE
-NM_TYPE_SERIAL_DEVICE
-nm_serial_device_get_type
-NM_SERIAL_DEVICE_CLASS
-NM_IS_SERIAL_DEVICE_CLASS
-NM_SERIAL_DEVICE_GET_CLASS
-

-
-

-nm-settings-system-interface
-NMSettingsSystem
-NMSettingsSystemPermissions
-NM_SETTINGS_SYSTEM_INTERFACE_HOSTNAME
-NM_SETTINGS_SYSTEM_INTERFACE_CAN_MODIFY
-NM_SETTINGS_SYSTEM_INTERFACE_CHECK_PERMISSIONS
-NMSettingsSystemInterfaceProp
-NMSettingsSystemInterface
-NMSettingsSystemSaveHostnameFunc
-NMSettingsSystemGetPermissionsFunc
-nm_settings_system_interface_save_hostname
-nm_settings_system_interface_get_permissions
+nm-ip6-config
+NMIP6Config
+NMIP6Config
+NMIP6ConfigClass
+NM_IP6_CONFIG_ADDRESSES
+NM_IP6_CONFIG_NAMESERVERS
+NM_IP6_CONFIG_DOMAINS
+NM_IP6_CONFIG_ROUTES
+nm_ip6_config_new
+nm_ip6_config_get_addresses
+nm_ip6_config_get_nameservers
+nm_ip6_config_get_domains
+nm_ip6_config_get_routes
 
-NM_SETTINGS_SYSTEM_INTERFACE
-NM_IS_SETTINGS_SYSTEM_INTERFACE
-NM_TYPE_SETTINGS_SYSTEM_INTERFACE
-nm_settings_system_interface_get_type
-NM_SETTINGS_SYSTEM_INTERFACE_GET_INTERFACE
+NM_IP6_CONFIG
+NM_IS_IP6_CONFIG
+NM_TYPE_IP6_CONFIG
+nm_ip6_config_get_type
+NM_IP6_CONFIG_CLASS
+NM_IS_IP6_CONFIG_CLASS
+NM_IP6_CONFIG_GET_CLASS
 

 
 

-nm-settings-service
-NMSettingsService
-NM_SETTINGS_SERVICE_BUS
-NM_SETTINGS_SERVICE_SCOPE
-NMSettingsService
-NMSettingsServiceClass
-nm_settings_service_get_connection_by_path
-nm_settings_service_export
-nm_settings_service_export_connection
+nm-device-modem
+NMDeviceModem
+NM_DEVICE_MODEM_MODEM_CAPABILITIES
+NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+NMDeviceModem
+NMDeviceModemClass
+nm_device_modem_get_modem_capabilities
+nm_device_modem_get_current_capabilities
 
-NM_SETTINGS_SERVICE
-NM_IS_SETTINGS_SERVICE
-NM_TYPE_SETTINGS_SERVICE
-nm_settings_service_get_type
-NM_SETTINGS_SERVICE_CLASS
-NM_IS_SETTINGS_SERVICE_CLASS
-NM_SETTINGS_SERVICE_GET_CLASS
+NM_DEVICE_MODEM
+NM_IS_DEVICE_MODEM
+NM_TYPE_DEVICE_MODEM
+nm_device_modem_get_type
+NM_DEVICE_MODEM_CLASS
+NM_IS_DEVICE_MODEM_CLASS
+NM_DEVICE_MODEM_GET_CLASS
 

 
 

-nm-object
-NMObject
-NM_OBJECT_DBUS_CONNECTION
-NM_OBJECT_DBUS_PATH
-NMObject
-NMObjectClass
-nm_object_get_connection
-nm_object_get_path
+nm-wimax-nsp
+NMWimaxNsp
+NM_WIMAX_NSP_NAME
+NM_WIMAX_NSP_SIGNAL_QUALITY
+NM_WIMAX_NSP_NETWORK_TYPE
+NMWimaxNspNetworkType
+NMWimaxNsp
+NMWimaxNspClass
+nm_wimax_nsp_new
+nm_wimax_nsp_get_name
+nm_wimax_nsp_get_signal_quality
+nm_wimax_nsp_get_network_type
+nm_wimax_nsp_filter_connections
+nm_wimax_nsp_connection_valid
 
-NM_OBJECT
-NM_IS_OBJECT
-NM_TYPE_OBJECT
-nm_object_get_type
-NM_OBJECT_CLASS
-NM_IS_OBJECT_CLASS
-NM_OBJECT_GET_CLASS
+NM_WIMAX_NSP
+NM_IS_WIMAX_NSP
+NM_TYPE_WIMAX_NSP
+nm_wimax_nsp_get_type
+NM_WIMAX_NSP_CLASS
+NM_IS_WIMAX_NSP_CLASS
+NM_WIMAX_NSP_GET_CLASS
 

 
 

@@ -601,26 +508,98 @@ NM_DEVICE_BT_GET_CLASS
 

 
 

-nm-settings-interface
-NMSettings
-NMSettingsInterfaceError
-NM_SETTINGS_INTERFACE_ERROR
-nm_settings_interface_error_quark
-NM_TYPE_SETTINGS_INTERFACE_ERROR
-NM_SETTINGS_INTERFACE_NEW_CONNECTION
-NM_SETTINGS_INTERFACE_CONNECTIONS_READ
-NMSettingsInterface
-NMSettingsAddConnectionFunc
-nm_settings_interface_get_type
-nm_settings_interface_list_connections
-nm_settings_interface_get_connection_by_path
-nm_settings_interface_add_connection
+nm-client
+NMClient
+NM_CLIENT_VERSION
+NM_CLIENT_STATE
+NM_CLIENT_MANAGER_RUNNING
+NM_CLIENT_NETWORKING_ENABLED
+NM_CLIENT_WIRELESS_ENABLED
+NM_CLIENT_WIRELESS_HARDWARE_ENABLED
+NM_CLIENT_WWAN_ENABLED
+NM_CLIENT_WWAN_HARDWARE_ENABLED
+NM_CLIENT_WIMAX_ENABLED
+NM_CLIENT_WIMAX_HARDWARE_ENABLED
+NM_CLIENT_ACTIVE_CONNECTIONS
+NMClientPermission
+NMClientPermissionResult
+NMClient
+NMClientClass
+nm_client_new
+nm_client_get_devices
+nm_client_get_device_by_path
+NMClientActivateFn
+nm_client_activate_connection
+NMClientAddActivateFn
+nm_client_add_and_activate_connection
+nm_client_deactivate_connection
+nm_client_networking_get_enabled
+nm_client_networking_set_enabled
+nm_client_wireless_get_enabled
+nm_client_wireless_set_enabled
+nm_client_wireless_hardware_get_enabled
+nm_client_wwan_get_enabled
+nm_client_wwan_set_enabled
+nm_client_wwan_hardware_get_enabled
+nm_client_wimax_get_enabled
+nm_client_wimax_set_enabled
+nm_client_wimax_hardware_get_enabled
+nm_client_get_version
+nm_client_get_state
+nm_client_get_manager_running
+nm_client_get_active_connections
+nm_client_sleep
+nm_client_get_permission_result
+
+NM_CLIENT
+NM_IS_CLIENT
+NM_TYPE_CLIENT
+nm_client_get_type
+NM_CLIENT_CLASS
+NM_IS_CLIENT_CLASS
+NM_CLIENT_GET_CLASS
+

+
+

+nm-dhcp4-config
+NMDHCP4Config
+NMDHCP4Config
+NMDHCP4ConfigClass
+NM_DHCP4_CONFIG_OPTIONS
+nm_dhcp4_config_new
+nm_dhcp4_config_get_options
+nm_dhcp4_config_get_one_option
+
+NM_DHCP4_CONFIG
+NM_IS_DHCP4_CONFIG
+NM_TYPE_DHCP4_CONFIG
+nm_dhcp4_config_get_type
+NM_DHCP4_CONFIG_CLASS
+NM_IS_DHCP4_CONFIG_CLASS
+

+
+

+nm-remote-connection
+NMRemoteConnection
+NM_REMOTE_CONNECTION_UPDATED
+NM_REMOTE_CONNECTION_REMOVED
+NMRemoteConnection
+NMRemoteConnectionClass
+NMRemoteConnectionCommitFunc
+NMRemoteConnectionDeleteFunc
+NMRemoteConnectionGetSecretsFunc
+nm_remote_connection_new
+nm_remote_connection_commit_changes
+nm_remote_connection_delete
+nm_remote_connection_get_secrets
 
-NM_SETTINGS_INTERFACE
-NM_IS_SETTINGS_INTERFACE
-NM_TYPE_SETTINGS_INTERFACE
-nm_settings_interface_error_get_type
-NM_SETTINGS_INTERFACE_GET_INTERFACE
+NM_REMOTE_CONNECTION
+NM_IS_REMOTE_CONNECTION
+NM_TYPE_REMOTE_CONNECTION
+nm_remote_connection_get_type
+NM_REMOTE_CONNECTION_CLASS
+NM_IS_REMOTE_CONNECTION_CLASS
+NM_REMOTE_CONNECTION_GET_CLASS
 

 
 

@@ -641,3 +620,38 @@ NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
 nm_ip6_route_object_array_get_type
 

 
+

+nm-secret-agent-glue
+g_marshal_value_peek_boolean
+g_marshal_value_peek_char
+g_marshal_value_peek_uchar
+g_marshal_value_peek_int
+g_marshal_value_peek_uint
+g_marshal_value_peek_long
+g_marshal_value_peek_ulong
+g_marshal_value_peek_int64
+g_marshal_value_peek_uint64
+g_marshal_value_peek_enum
+g_marshal_value_peek_flags
+g_marshal_value_peek_float
+g_marshal_value_peek_double
+g_marshal_value_peek_string
+g_marshal_value_peek_param
+g_marshal_value_peek_boxed
+g_marshal_value_peek_pointer
+g_marshal_value_peek_object
+g_marshal_value_peek_variant
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER
+

+
+

+nm-vpn-plugin-utils
+nm_vpn_plugin_utils_read_vpn_details
+nm_vpn_plugin_utils_get_secret_flags
+

+
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
deleted file mode 100644
index 8b3b3d2a..00000000
--- a/docs/libnm-glib/libnm-glib.types
+++ /dev/null
@@ -1,40 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-nm_client_get_type
-nm_object_get_type
-nm_device_get_type
-nm_device_ethernet_get_type
-nm_device_wifi_get_type
-nm_cdma_device_get_type
-nm_gsm_device_get_type
-nm_serial_device_get_type
-nm_device_bt_get_type
-nm_access_point_get_type
-nm_ip4_config_get_type
-nm_ip6_config_get_type
-nm_active_connection_get_type
-nm_dhcp4_config_get_type
-nm_dhcp6_config_get_type
-nm_remote_settings_get_type
-nm_exported_connection_get_type
-nm_remote_connection_get_type
-nm_vpn_connection_get_type
-
diff --git a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml b/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
deleted file mode 100644
index b3c2c6d6..00000000
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-NMAccessPoint
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
deleted file mode 100644
index c642d1fc..00000000
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,209 +0,0 @@
-
-NMActiveConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-cdma-device.sgml b/docs/libnm-glib/tmpl/nm-cdma-device.sgml
deleted file mode 100644
index bcb72892..00000000
--- a/docs/libnm-glib/tmpl/nm-cdma-device.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-NMCdmaDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
deleted file mode 100644
index b30dffd8..00000000
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,367 +0,0 @@
-
-NMClient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-
-
-
-
-
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@device_added: 
-@device_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@user_data: 
-@object_path: 
-@error: 
-
-
-
-
-
-
-
-@client: 
-@service_name: 
-@connection_path: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@active: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@sleep: 
-
-
-
-
-
-
-
-@client: 
-@permission: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
deleted file mode 100644
index d3ce4dc5..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-NMDeviceBt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index ee82d5af..00000000
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,137 +0,0 @@
-
-NMDeviceEthernet
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index 0ef2031d..00000000
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,216 +0,0 @@
-
-NMDeviceWifi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@access_point_added: 
-@access_point_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
deleted file mode 100644
index 7c38adf6..00000000
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,378 +0,0 @@
-
-NMDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@state_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
deleted file mode 100644
index 35a6e306..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-NMDHCP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
deleted file mode 100644
index 3e00467c..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-NMDHCP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection.sgml b/docs/libnm-glib/tmpl/nm-exported-connection.sgml
deleted file mode 100644
index c2ba3b21..00000000
--- a/docs/libnm-glib/tmpl/nm-exported-connection.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMExportedConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@get_settings: 
-@update: 
-@delete: 
-@get_secrets: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@scope: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-gsm-device.sgml b/docs/libnm-glib/tmpl/nm-gsm-device.sgml
deleted file mode 100644
index bb4e7232..00000000
--- a/docs/libnm-glib/tmpl/nm-gsm-device.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-NMGsmDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
deleted file mode 100644
index 3fd603b2..00000000
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ /dev/null
@@ -1,179 +0,0 @@
-
-NMIP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
deleted file mode 100644
index a9c44abd..00000000
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ /dev/null
@@ -1,137 +0,0 @@
-
-NMIP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
deleted file mode 100644
index d1919d39..00000000
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-NMObject
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@object: 
-@Returns: 
-
-
-
-
-
-
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index d43534e1..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-NMRemoteConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@bus: 
-@scope: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml b/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml
deleted file mode 100644
index c14d4b2e..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings-system.sgml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-NMRemoteSettingsSystem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@bus: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
deleted file mode 100644
index 6f95df14..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-NMRemoteSettings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@bus: 
-@scope: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-serial-device.sgml b/docs/libnm-glib/tmpl/nm-serial-device.sgml
deleted file mode 100644
index 7f6403fe..00000000
--- a/docs/libnm-glib/tmpl/nm-serial-device.sgml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-NMSerialDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmserialdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-@parent: 
-@ppp_stats: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml
deleted file mode 100644
index 9e05931a..00000000
--- a/docs/libnm-glib/tmpl/nm-settings-connection-interface.sgml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-NMSettingsConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@hints: 
-@request_new: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-interface.sgml
deleted file mode 100644
index 846d5464..00000000
--- a/docs/libnm-glib/tmpl/nm-settings-interface.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-NMSettings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION: 
-@NM_SETTINGS_INTERFACE_ERROR_READ_ONLY_CONNECTION: 
-@NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR: 
-@NM_SETTINGS_INTERFACE_ERROR_SECRETS_UNAVAILABLE: 
-@NM_SETTINGS_INTERFACE_ERROR_SECRETS_REQUEST_CANCELED: 
-@NM_SETTINGS_INTERFACE_ERROR_PERMISSION_DENIED: 
-@NM_SETTINGS_INTERFACE_ERROR_INVALID_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@settings: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-service.sgml b/docs/libnm-glib/tmpl/nm-settings-service.sgml
deleted file mode 100644
index a79c966b..00000000
--- a/docs/libnm-glib/tmpl/nm-settings-service.sgml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-NMSettingsService
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-
-
-
-
-
-
-@parent: 
-@list_connections: 
-@add_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@self: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-
-
-
-
-
-
-
-@self: 
-@exported: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml b/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml
deleted file mode 100644
index 9ee1ef69..00000000
--- a/docs/libnm-glib/tmpl/nm-settings-system-interface.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-NMSettingsSystem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTINGS_SYSTEM_PERMISSION_NONE: 
-@NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY: 
-@NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_FIRST: 
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_HOSTNAME: 
-@NM_SETTINGS_SYSTEM_INTERFACE_PROP_CAN_MODIFY: 
-
-
-
-
-
-
-@g_iface: 
-@save_hostname: 
-@get_permissions: 
-@check_permissions: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@settings: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@settings: 
-@permissions: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@settings: 
-@hostname: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
deleted file mode 100644
index f57d882e..00000000
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-nm-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 8e4e18a8..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-NMVPNConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmvpnconnection: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@vpn_state_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@dbus_connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
deleted file mode 100644
index ace182a8..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ /dev/null
@@ -1,259 +0,0 @@
-
-NMVpnPluginUi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@g_iface: 
-@ui_factory: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_name: 
-@delete_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@g_iface: 
-@get_widget: 
-@update_connection: 
-@save_secrets: 
-@changed: 
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@path: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@obj: 
-
-
-
-
-
-
-
-@obj: 
-
-
-
-
-
-
-
-@obj: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
deleted file mode 100644
index 061e4edf..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-NMVPNPlugin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_PLUGIN_ERROR_GENERAL: 
-@NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: 
-@NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: 
-@NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: 
-@NM_VPN_PLUGIN_ERROR_WRONG_STATE: 
-@NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: 
-@NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
-@NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-
-
-
-
-
-
-@parent: 
-@connect: 
-@need_secrets: 
-@disconnect: 
-@state_changed: 
-@ip4_config: 
-@login_banner: 
-@failure: 
-@quit: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@state: 
-
-
-
-
-
-
-
-@plugin: 
-@banner: 
-
-
-
-
-
-
-
-@plugin: 
-@reason: 
-
-
-
-
-
-
-
-@plugin: 
-@ip4_config: 
-
-
-
-
-
-
-
-@plugin: 
-@err: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 5138306a..0b90a06e 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -44,11 +44,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = docs/libnm-util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -65,7 +70,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -74,13 +78,15 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 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@
@@ -92,6 +98,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -100,6 +107,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -108,8 +116,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -124,13 +132,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
+IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
+IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -138,6 +156,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -146,13 +166,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -178,13 +200,12 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
 SED = @SED@
@@ -198,11 +219,15 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 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@
@@ -323,17 +348,18 @@ GTKDOC_LIBS = \
 #
 GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+SETUP_FILES = \
 	$(content_files)		\
-	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = \
+	$(SETUP_FILES)
+
+DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -555,20 +581,38 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
+	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	   if test "x$$files" != "x" ; then \
+	       for file in $$files ; do \
+	           test -f $(abs_srcdir)/$$file && \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+	       done \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	fi
+	@touch setup-build.stamp
+
+setup.stamp: setup-build.stamp
+	@true
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
                test -f $$i || touch $$i ; \
 	    done \
@@ -580,10 +624,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### templates ####
 
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -597,11 +645,11 @@ $(srcdir)/tmpl/*.sgml:
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -611,26 +659,32 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options=--path="$(abs_srcdir)"; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
 	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@rm -rf $(DOC_MODULE).pdf
 	@mkpdf_imgdirs=""; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
@@ -641,7 +695,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
@@ -651,12 +705,15 @@ clean-local:
 	rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -701,11 +758,11 @@ uninstall-local:
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
+	cp $(builddir)/html/* $(distdir)/html
+	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+	-cp $(build)/$(DOC_MODULE).types $(distdir)/
+	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
 	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
deleted file mode 100644
index 3ff24b7e..00000000
--- a/docs/libnm-util/html/NMConnection.html
+++ /dev/null
@@ -1,1062 +0,0 @@
-
-
-
-
-NMConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMConnection

-
NMConnection — Describes a connection to specific network or provider

-

-

-
Synopsis

-
-#include <nm-connection.h>
-
-enum                NMConnectionScope;
-enum                NMConnectionError;
-#define             NM_TYPE_CONNECTION_ERROR
-#define             NM_CONNECTION_ERROR
-GQuark              nm_connection_error_quark           (void);
-#define             NM_CONNECTION_SCOPE
-#define             NM_CONNECTION_PATH
-                    NMConnection;
-                    NMConnectionClass;
-GType               nm_connection_get_type              (void);
-NMConnection *      nm_connection_new                   (void);
-NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);
-NMConnection *      nm_connection_duplicate             (NMConnection *connection);
-void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);
-void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);
-gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);
-gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);
-gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);
-gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);
-const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);
-void                nm_connection_clear_secrets         (NMConnection *connection);
-gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *setting_secrets,
-                                                         GError **error);
-void                nm_connection_set_scope             (NMConnection *connection,
-                                                         NMConnectionScope scope);
-NMConnectionScope   nm_connection_get_scope             (NMConnection *connection);
-void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);
-const char *        nm_connection_get_path              (NMConnection *connection);
-void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);
-GHashTable *        nm_connection_to_hash               (NMConnection *connection);
-void                nm_connection_dump                  (NMConnection *connection);
-NMSetting *         nm_connection_create_setting        (const char *name);
-GType               nm_connection_lookup_setting_type   (const char *name);
-GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);
-

-

-

-
Object Hierarchy

-
-  GObject
-   +----NMConnection
-

-

-

-
Properties

-
-  "path"                     gchar*                : Read / Write / Construct
-  "scope"                    guint                 : Read / Write / Construct
-

-

-

-
Signals

-
-  "secrets-updated"                                : Run First
-

-

-

-
Description

-

-An NMConnection describes all the settings and configuration values that
-are necessary to configure network devices for operation on a specific
-network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a NMConnection, or
-disconnected without having been connected with a NMConnection.
-

-

-Each NMConnection contains a list of NMSetting objects usually referenced
-by name (using nm_connection_get_setting_by_name()) or by type (with
-nm_connection_get_setting()).  The settings describe the actual parameters
-with which the network devices are configured, including device-specific
-parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
-(addresses, routes, addressing methods, etc).
-

-

-Most connections also have a NMConnectionScope; a connection will be
-provided over D-Bus either by the user settings service
-(org.freedesktop.NetworkManagerUserSettings) running in an active user
-session, or by the system-wide system settings service
-(org.freedesktop.NetworkManagerSystemSettings) which provides  connections
-for all users.
-

-

-

-
Details

-

-
enum NMConnectionScope

-
typedef enum {
-	NM_CONNECTION_SCOPE_UNKNOWN = 0,
-	NM_CONNECTION_SCOPE_SYSTEM,
-	NM_CONNECTION_SCOPE_USER
-} NMConnectionScope;
-

-

-Connection scope indicated what settings service, if any, provides the
-connection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_CONNECTION_SCOPE_UNKNOWN
scope not known or not yet set
-
NM_CONNECTION_SCOPE_SYSTEM
connection is provided by the system settings
-  service
-
NM_CONNECTION_SCOPE_USER
connection is provided by a user settings service
-

-

-

-

-
enum NMConnectionError

-
typedef enum
-{
-	NM_CONNECTION_ERROR_UNKNOWN = 0,
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
-} NMConnectionError;
-

-

-Describes errors that may result from operations involving a NMConnection.
-

-

--
-
-
-
-
-
-
-
-
-
-


NM_CONNECTION_ERROR_UNKNOWN
unknown or unclassified error
-
NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
the NMConnection object
-  did not contain the required NMSettingConnection object, which must be
-  present for all connections
-

-

-

-

-
NM_TYPE_CONNECTION_ERROR

-
#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
-

-

-

-

-

-

-
NM_CONNECTION_ERROR

-
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
-

-

-

-

-

-

-
nm_connection_error_quark ()

-
GQuark              nm_connection_error_quark           (void);

-

-Registers an error quark for NMConnection if necessary.
-

-

--
-
-
-
-


Returns :
 the error quark used for NMConnection errors.
-

-

-

-

-
NM_CONNECTION_SCOPE

-
#define NM_CONNECTION_SCOPE "scope"
-

-

-

-

-

-

-
NM_CONNECTION_PATH

-
#define NM_CONNECTION_PATH "path"
-

-

-

-

-

-

-
NMConnection

-
typedef struct _NMConnection NMConnection;

-

-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMConnectionClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-

-

-

-

-

-

-
nm_connection_get_type ()

-
GType               nm_connection_get_type              (void);

-

-

-

--
-
-
-
-


Returns :

-

-

-

-

-
nm_connection_new ()

-
NMConnection *      nm_connection_new                   (void);

-

-Creates a new NMConnection object with no NMSetting objects.
-

-

--
-
-
-
-


Returns :
 the new empty NMConnection object
-

-

-

-

-
nm_connection_new_from_hash ()

-
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);

-

-Creates a new NMConnection from a hash table describing the connection.  See
-nm_connection_to_hash() for a description of the expected hash table.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


hash :
the GHashTable describing the connection
-
error :
on unsuccessful return, an error
-
Returns :
 the new NMConnection object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validate
-

-

-

-

-
nm_connection_duplicate ()

-
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

-

-Duplicates a NMConnection.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection to duplicate
-
Returns :
 a new NMConnection containing the same settings and properties
-as the source NMConnection
-

-

-

-

-
nm_connection_add_setting ()

-
void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);

-

-Adds a NMSetting to the connection, replacing any previous NMSetting of the
-same name which has previously been added to the NMConnection.  The
-connection takes ownership of the NMSetting object and does not increase
-the setting object's reference count.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
setting :
the NMSetting to add to the connection object
-

-

-

-

-
nm_connection_remove_setting ()

-
void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);

-

-Removes the NMSetting with the given GType from the NMConnection.  This
-operation dereferences the NMSetting object.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
setting_type :
the GType of the setting object to remove
-

-

-

-

-
nm_connection_get_setting ()

-
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);

-

-Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
setting_type :
the GType of the setting object to return
-
Returns :
 the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection
-

-

-

-

-
nm_connection_get_setting_by_name ()

-
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);

-

-Gets the NMSetting with the given name, if one has been previously added
-the the NMConnection.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
name :
a setting name
-
Returns :
 the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection
-

-

-

-

-
nm_connection_replace_settings ()

-
gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
new_settings :
a GHashTable of settings
-
error :
location to store error, or NULL
-
Returns :
 TRUE if the settings were valid and added to the connection, FALSE
-if they were not
-

-

-

-

-
nm_connection_compare ()

-
gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);

-

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


a :
a NMConnection
-
b :
a second NMConnection to compare with the first
-
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
Returns :
 TRUE if the comparison succeeds, FALSE if it does not
-

-

-

-

-
nm_connection_diff ()

-
gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);

-

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned out_settings hash table.
-No values are returned, only key names.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


a :
a NMConnection
-
b :
a second NMConnection to compare with the first
-
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
out_settings :
if the connections differ, on return a hash table mapping
-setting names to second-level GHashTable, which contains key names that differ
-
Returns :
 TRUE if the connections contain the same values, FALSE if they do
-not
-

-

-

-

-
nm_connection_verify ()

-
gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);

-

-Validates the connection and all its settings.  Each setting's properties
-have allowed values, and some values are dependent on other values.  For
-example, if a WiFi connection is security enabled, the NMSettingWireless
-setting object's 'security' property must contain the setting name of the
-NMSettingWirelessSecurity object, which must also be present in the 
-connection for the connection to be valid.  As another example, the
-NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
-setting and which property failed validation, and how it failed validation.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection to verify
-
error :
location to store error, or NULL
-
Returns :
 TRUE if the connection is valid, FALSE if it is not
-

-

-

-

-
nm_connection_need_secrets ()

-
const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);

-

-Returns the name of the first setting object in the connection which would
-need secrets to make a successful connection.  The returned hints are only
-intended as a guide to what secrets may be required, because in some
-circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which
-on return points to an allocated GPtrArray containing the property names of
-secrets of the NMSetting which may be required; the caller owns the array
-and must free the each array element with g_free(), as well as the array
-itself with g_ptr_array_free()
-
Returns :
 the setting name of the NMSetting object which has invalid or
-missing secrets
-

-

-

-

-
nm_connection_clear_secrets ()

-
void                nm_connection_clear_secrets         (NMConnection *connection);

-

-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
-

-

--
-
-
-
-


connection :
the NMConnection
-

-

-

-

-
nm_connection_update_secrets ()

-
gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *setting_secrets,
-                                                         GError **error);

-

-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
setting_name :
the setting object name to which the secrets apply
-
setting_secrets :
a GHashTable mapping string:GValue of setting property names and
-secrets
-
error :
location to store error, or NULL
-
Returns :
 TRUE if the secrets were successfully updated and the connection
-is valid, FALSE on failure or if the setting was never added to the connection
-

-

-

-

-
nm_connection_set_scope ()

-
void                nm_connection_set_scope             (NMConnection *connection,
-                                                         NMConnectionScope scope);

-

-Sets the scope of the connection.  This property is not serialized, and is
-only for the reference of the caller.  A connection may have no scope
-(internal, temporary connections), "system" scope (provided by the system
-settings service), or "user" scope, provided by a user settings service.  The
-creator of the NMConnection object is responsible for setting the
-connection's scope if needed.  Sets the "scope" property.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
scope :
the scope of the connection
-

-

-

-

-
nm_connection_get_scope ()

-
NMConnectionScope   nm_connection_get_scope             (NMConnection *connection);

-

-Returns the connection scope.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
Returns :
 the scope of the connection, previously set by a call to
-nm_connection_set_scope().
-

-

-

-

-
nm_connection_set_path ()

-
void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);

-

-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the "path"
-property.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
path :
the D-Bus path of the connection as given by the settings service
-which provides the connection
-

-

-

-

-
nm_connection_get_path ()

-
const char *        nm_connection_get_path              (NMConnection *connection);

-

-Returns the connection's D-Bus path.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
Returns :
 the D-Bus path of the connection, previously set by a call to
-nm_connection_set_path().
-

-

-

-

-
nm_connection_for_each_setting_value ()

-
void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);

-

-Iterates over the properties of each NMSetting object in the NMConnection,
-calling the supplied user function for each property.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
func :
user-supplied function called for each setting's property
-
user_data :
user data passed to func at each invocation
-

-

-

-

-
nm_connection_to_hash ()

-
GHashTable *        nm_connection_to_hash               (NMConnection *connection);

-

-Converts the NMConnection into a GHashTable describing the connection,
-suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:GHashTable with each element in the returned hash representing
-a NMSetting object.  The keys are setting object names, and the values
-are GHashTables mapping string:GValue, each of which represents the
-properties of the NMSetting object.
-

-

--
-
-
-
-
-
-
-
-
-
-


connection :
the NMConnection
-
Returns :
 a new GHashTable describing the connection, its settings, and
-each setting's properties.  The caller owns the hash table and must unref
-the hash table with g_hash_table_unref() when it is no longer needed.
-

-

-

-

-
nm_connection_dump ()

-
void                nm_connection_dump                  (NMConnection *connection);

-

-Print the connection to stdout.  For debugging purposes ONLY, should NOT
-be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
-

-

--
-
-
-
-


connection :
the NMConnection
-

-

-

-

-
nm_connection_create_setting ()

-
NMSetting *         nm_connection_create_setting        (const char *name);

-

-Create a new NMSetting object of the desired type, given a setting name.
-

-

--
-
-
-
-
-
-
-
-
-
-


name :
a setting name
-
Returns :
 the new setting object, or NULL if the setting name was unknown
-

-

-

-

-
nm_connection_lookup_setting_type ()

-
GType               nm_connection_lookup_setting_type   (const char *name);

-

-Returns the GType of the setting's class for a given setting name.
-

-

--
-
-
-
-
-
-
-
-
-
-


name :
a setting name
-
Returns :
 the GType of the setting's class
-

-

-

-

-
nm_connection_lookup_setting_type_by_quark ()

-
GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);

-

-Returns the GType of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
-

-

--
-
-
-
-
-
-
-
-
-
-


error_quark :
a setting error quark
-
Returns :
 the GType of the setting's class
-

-

-

-

-
Property Details

-

-
The "path" property

-
  "path"                     gchar*                : Read / Write / Construct

-

-The connection's D-Bus path, used only by the calling process as a record
-of the D-Bus path of the connection as provided by a settings service.
-

-
Default value: NULL

-

-

-

-
The "scope" property

-
  "scope"                    guint                 : Read / Write / Construct

-

-The connection's scope, used only by the calling process as a record
-of which settings service the connection is provided by.  One of the
-NM_CONNECTION_SCOPE_* defines.
-

-
Allowed values: <= 2

-
Default value: 0

-

-

-

-
Signal Details

-

-
The "secrets-updated" signal

-
void                user_function                      (NMConnection *connection,
-                                                        gchar        *setting_name,
-                                                        gpointer      user_data)         : Run First

-

-The ::secrets-updated signal is emitted when the secrets of a setting
-have been changed.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


connection :
the object on which the signal is emitted
-
setting_name :
the setting name of the NMSetting for which secrets were
-updated
-
user_data :
user data set when the signal handler was connected.

-

-

-

-

-

-          Generated by GTK-Doc V1.15

-
-
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 77129d21..c77c5985 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -6,15 +6,15 @@
 
 
 
-
+
 
-
+
 
 
 
 
-
+
@@ -30,7 +30,7 @@
                   Properties
-

+

 

 

 
@@ -39,12 +39,12 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting.h>
 
-enum                NMSettingError;
+enum                NMSettingError;
 #define             NM_TYPE_SETTING_ERROR
 #define             NM_SETTING_ERROR
 GQuark              nm_setting_error_quark              (void);
@@ -53,6 +53,7 @@ enum                NM_SETTING_PARAM_SECRET
 #define             NM_SETTING_PARAM_FUZZY_IGNORE
 #define             NM_SETTING_NAME
+enum                NMSettingSecretFlags;
                     NMSetting;
                     NMSettingClass;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
@@ -61,7 +62,9 @@ enum                GParamFlags flags,
                                                          gpointer user_data);
 GType               nm_setting_get_type                 (void);
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting);
+enum                NMSettingHashFlags;
+GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);
 NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);
 NMSetting *         nm_setting_duplicate                (NMSetting *setting);
@@ -88,10 +91,22 @@ enum                gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
                                                          GError **error);
+gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags,
+                                                         GError **error);
+gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags flags,
+                                                         GError **error);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingError
+

 
   GObject
    +----NMSetting
@@ -107,31 +122,32 @@ enum                NMSettingPPPOE
          +----NMSettingSerial
          +----NMSettingVPN
+         +----NMSettingWimax
          +----NMSettingWired
          +----NMSettingWireless
          +----NMSettingWirelessSecurity
 

 

-

+

 
Properties

 
   "name"                     gchar*                : Read / Write
 

 

-

+

 
Description

 

 Each NMSetting contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or WiFi).  A collection of individual settings together
-make up an NMConnection. Each property is strongly typed and usually has
+make up an NMConnection. Each property is strongly typed and usually has
 a number of allowed values.  See each NMSetting subclass for a description
 of properties and allowed values.
 

 

-

+

 
Details

-

+

 
enum NMSettingError

 
typedef enum
 {
@@ -175,7 +191,7 @@ Describes errors that may result from operations involving a 

 

 

-

+

 
NM_TYPE_SETTING_ERROR

 
#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ()) 
 

@@ -183,7 +199,7 @@ Describes errors that may result from operations involving a 
 

 

-

+

 
NM_SETTING_ERROR

 
#define NM_SETTING_ERROR nm_setting_error_quark ()
 

@@ -191,7 +207,7 @@ Describes errors that may result from operations involving a 
 

 

-

+

 
nm_setting_error_quark ()

 
GQuark              nm_setting_error_quark              (void);

 

@@ -201,13 +217,12 @@ Registers an error quark for 
 
 
Returns :

- the error quark used for NMSetting errors.
-
+the error quark used for NMSetting errors.
 
 

 

 

-

+

 
NM_SETTING_PARAM_SERIALIZE

 
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
 

@@ -215,7 +230,7 @@ Registers an error quark for 
+

 
NM_SETTING_PARAM_REQUIRED

 
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
 

@@ -223,7 +238,7 @@ Registers an error quark for 
+

 
NM_SETTING_PARAM_SECRET

 
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
 

@@ -231,7 +246,7 @@ Registers an error quark for 
+

 
NM_SETTING_PARAM_FUZZY_IGNORE

 
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
 

@@ -239,7 +254,7 @@ Registers an error quark for 
+

 
NM_SETTING_NAME

 
#define NM_SETTING_NAME "name"
 

@@ -247,7 +262,57 @@ Registers an error quark for 
+

+
enum NMSettingSecretFlags

+
typedef enum {
+	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
+	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
+	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
+	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
+
+	/* NOTE: if adding flags, update nm-setting-private.h as well */
+} NMSettingSecretFlags;
+

+

+These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.
+

+

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


NM_SETTING_SECRET_FLAG_NONE
the system is responsible for providing and
+storing this secret (default)
+
NM_SETTING_SECRET_FLAG_AGENT_OWNED
a user secret agent is responsible
+for providing and storing this secret; when it is required agents will be
+asked to retrieve it
+
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
+should be requested from the user each time it is needed
+
NM_SETTING_SECRET_FLAG_NOT_REQUIRED
in situations where it cannot be
+automatically determined that the secret is required (some VPNs and PPP
+providers dont require all secrets) this flag indicates that the specific
+secret is not required
+

+

+

+

 
NMSetting

 
typedef struct _NMSetting NMSetting;

 

@@ -256,7 +321,7 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
NMSettingClass

 
typedef struct {
 	GObjectClass parent;
@@ -273,6 +338,18 @@ It should only be accessed through the functions described below.
 	                                  GValue     *value,
 	                                  GError    **error);
 
+	gboolean    (*get_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags *out_flags,
+	                                  GError **error);
+
+	gboolean    (*set_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags flags,
+	                                  GError **error);
+
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -284,7 +361,7 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
NMSettingValueIterFn ()

 
void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
@@ -293,56 +370,53 @@ It should only be accessed through the functions described below.
                                                          gpointer user_data);

 

 

+

+

+

+
nm_setting_get_type ()

+
GType               nm_setting_get_type                 (void);

+

+

+

+

+

+
enum NMSettingHashFlags

+
typedef enum {
+	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
+	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
+	NM_SETTING_HASH_FLAG_ONLY_SECRETS = 0x00000002,
+} NMSettingHashFlags;
+

+

+These flags determine which properties are added to the resulting hash
+when calling nm_setting_to_hash().
+

 

-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+

 
 
 
setting :

+
NM_SETTING_HASH_FLAG_ALL
hash all properties (including secrets)
 
 

 
key :

+
NM_SETTING_HASH_FLAG_NO_SECRETS
do not include secrets
 
 

 
value :

-
flags :

-
user_data :

+
NM_SETTING_HASH_FLAG_ONLY_SECRETS
only hash secrets
 
 

 
 

 

 

-

-
nm_setting_get_type ()

-
GType               nm_setting_get_type                 (void);

-

-

-

--
-
-
-
-


Returns :

-

-

-

-

+

 
nm_setting_to_hash ()

-
GHashTable *        nm_setting_to_hash                  (NMSetting *setting);

+
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);

 

 Converts the NMSetting into a GHashTable mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
@@ -357,15 +431,20 @@ D-Bus or serializing.  The mapping is string:GValue.
 
 
 
+
flags :

+hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
+
+
+
 
Returns :

- a new GHashTable describing the setting's properties
+a new GHashTable describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
 
 
 
 

 

 

-

+

 
nm_setting_new_from_hash ()

 
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
                                                          GHashTable *hash);

@@ -382,26 +461,23 @@ property names and value types.
 
 
 
setting_type :

-the NMSetting type which the hash contains properties for
-
+the NMSetting type which the hash contains properties for
 
 
 
hash :

 the GHashTable containing a string:GValue mapping of properties
-that apply to the setting
-
+that apply to the setting
 
 
 
Returns :

- a new NMSetting object populated with the properties from the
-hash table, or NULL on failure
-
+a new NMSetting object populated with the properties from the
+hash table, or NULL on failure
 
 
 

 

 

-

+

 
nm_setting_duplicate ()

 
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

 

@@ -412,20 +488,19 @@ Duplicates a 
 
 
setting :

-the NMSetting to duplicate
-
+the NMSetting to duplicate
 
 
 
Returns :

- a new NMSetting containing the same properties and values as the
-source NMSetting
+a new NMSetting containing the same properties and values as the
+source NMSetting. [transfer full]
 
 
 
 

 

 

-

+

 
nm_setting_get_name ()

 
const char *        nm_setting_get_name                 (NMSetting *setting);

 

@@ -441,15 +516,14 @@ Returns the type name of the Returns :

- a string containing the type name of the NMSetting object,
-like 'ppp' or 'wireless' or 'wired'.
-
+a string containing the type name of the NMSetting object,
+like 'ppp' or 'wireless' or 'wired'.
 
 
 

 

 

-

+

 
nm_setting_verify ()

 
gboolean            nm_setting_verify                   (NMSetting *setting,
                                                          GSList *all_settings,
@@ -465,14 +539,12 @@ failed validation, and in what way that property failed validation.
 
 
 
setting :

-the NMSetting to verify
-
+the NMSetting to verify
 
 
 
all_settings :

 a GSList of all settings in the connection from which setting
-came
-
+came
 
 
 
error :

@@ -481,14 +553,14 @@ came
 
 
 
Returns :

- TRUE if the setting is valid, FALSE if it is not
-
+
+TRUE if the setting is valid, FALSE if it is not
 
 
 

 

 

-

+

 
enum NMSettingCompareFlags

 
typedef enum {
 	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
@@ -530,7 +602,7 @@ two connections.
 

 

 

-

+

 
nm_setting_compare ()

 
gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
@@ -550,8 +622,7 @@ for a description of each flag's behavior.
 
 
 
b :

-a second NMSetting to compare with the first
-
+a second NMSetting to compare with the first
 
 
 
flags :

@@ -560,14 +631,14 @@ for a description of each flag's behavior.
 
 
 
Returns :

- TRUE if the comparison succeeds, FALSE if it does not
-
+
+TRUE if the comparison succeeds, FALSE if it does not
 
 
 

 

 

-

+

 
enum NMSettingDiffResult

 
typedef enum {
 	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
@@ -600,7 +671,7 @@ These values indicate the result of a setting difference operation.
 

 

 

-

+

 
nm_setting_diff ()

 
gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
@@ -624,8 +695,7 @@ one or more b :

-a second NMSetting to compare with the first
-
+a second NMSetting to compare with the first
 
 
 
flags :

@@ -635,12 +705,11 @@ one or more invert_results :

 this parameter is used internally by libnm-util and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
-
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
 
 
 
results :

- if the settings differ, on return a
+if the settings differ, on return a
 hash table mapping the differing keys to one or more NMSettingDiffResult
 values OR-ed together.  If the settings do not differ, any hash table passed
 in is unmodified.  If no hash table is passed in, a new one is created. [element-type utf8 guint32]
@@ -648,14 +717,14 @@ in is unmodified.  If no hash table is passed in, a new one is created. 
 
 
Returns :

- TRUE if the settings contain the same values, FALSE if they do not
-
+
+TRUE if the settings contain the same values, FALSE if they do not
 
 
 

 

 

-

+

 
nm_setting_enumerate_values ()

 
void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
@@ -674,19 +743,18 @@ user function for each property.
 
 
 
func :

-user-supplied function called for each property of the setting
+user-supplied function called for each property of the setting. [scope call]
 
 
 
 
user_data :

-user data passed to func at each invocation
-
+user data passed to func at each invocation
 
 
 

 

 

-

+

 
nm_setting_to_string ()

 
char *              nm_setting_to_string                (NMSetting *setting);

 

@@ -704,7 +772,7 @@ output format is not guaranteed to be stable and may change at any time.
 
 
 
Returns :

- an allocated string containing a textual representation of the
+an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with g_free()
 
@@ -713,7 +781,7 @@ free with 
+

 
nm_setting_clear_secrets ()

 
void                nm_setting_clear_secrets            (NMSetting *setting);

 

@@ -731,7 +799,7 @@ leakage of information.
 

 

 

-

+

 
nm_setting_need_secrets ()

 
GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

 

@@ -750,17 +818,17 @@ is no way to conclusively determine exactly which secrets are needed.
 
 
 
Returns :

- a GPtrArray containing the property names of secrets of the
+a GPtrArray containing the property names of secrets of the
 NMSetting which may be required; the caller owns the array
 and must free the each array element with g_free(), as well as the array
-itself with g_ptr_array_free()
+itself with g_ptr_array_free(). [transfer full][element-type utf8]
 
 
 
 

 

 

-

+

 
nm_setting_update_secrets ()

 
gboolean            nm_setting_update_secrets           (NMSetting *setting,
                                                          GHashTable *secrets,
@@ -780,27 +848,106 @@ setting (deserialized from D-Bus for example).
 
 
secrets :

 a GHashTable mapping string:GValue of setting property names and
-secrets
+secrets
+
+
+
error :

+location to store error, or NULL
 
 
 
+
Returns :

+
+TRUE if the secrets were successfully updated and the connection
+is valid, FALSE on failure or if the setting was never added to the connection
+
+
+

+

+

+

+
nm_setting_get_secret_flags ()

+
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags,
+                                                         GError **error);

+

+For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.
+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+


setting :
the NMSetting
+
secret_name :
the secret key name to get flags for
out_flags :
on success, the NMSettingSecretFlags for the secret

 
error :

 location to store error, or NULL
 
 

 

 
Returns :
 TRUE if the secrets were successfully updated and the connection
-is valid, FALSE on failure or if the setting was never added to the connection
+TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not

+

+

+

+
nm_setting_set_secret_flags ()

+
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags flags,
+                                                         GError **error);

+

+For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.
+

+

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


setting :
the NMSetting
+
secret_name :
the secret key name to set flags for
flags :
the NMSettingSecretFlags for the secret
error :
location to store error, or NULL
 
 
Returns :
TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not

 
 

 

 

-

+

 
Property Details

-

+

 
The "name" property

 
  "name"                     gchar*                : Read / Write

 

@@ -814,6 +961,6 @@ example 'ppp' or 'wireless' or 'wired'.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index aec1b96e..8ef172c1 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,15 +39,15 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting-8021x.h>
 
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
 #define             NM_SETTING_802_1X_SETTING_NAME
-enum                NMSetting8021xError;
+enum                NMSetting8021xError;
 #define             NM_TYPE_SETTING_802_1X_ERROR
 #define             NM_SETTING_802_1X_ERROR
 GQuark              nm_setting_802_1x_error_quark       (void);
@@ -66,12 +66,15 @@ enum                NM_SETTING_802_1X_PHASE2_CA_PATH
 #define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 #define             NM_SETTING_802_1X_PASSWORD
+#define             NM_SETTING_802_1X_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
+#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PIN
-#define             NM_SETTING_802_1X_PSK
+#define             NM_SETTING_802_1X_PIN_FLAGS
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
                     NMSetting8021x;
                     NMSetting8021xClass;
@@ -96,8 +99,10 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
+const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
+                                                        (NMSetting8021x *setting);
+const char *            nm_setting_802_1x_get_ca_cert_path
+                                                        (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
                                                          NMSetting8021xCKScheme scheme,
@@ -105,9 +110,9 @@ const char *        GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_client_cert_blob
+const GByteArray *      nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_client_cert_path
+const char *            nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -125,9 +130,9 @@ const char *        NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
+const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_cert_path
+const char *            nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -137,9 +142,9 @@ const char *        GError **error);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_client_cert_path
+const char *            nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -148,13 +153,15 @@ const char *        NMSetting8021xCKFormat *out_format,
                                                          GError **error);
 const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
+NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
+                                                        (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_psk           (NMSetting8021x *setting);
+NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_private_key_blob
+const GByteArray *      nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_private_key_path
+const char *            nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -162,15 +169,17 @@ const char *        NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *        nm_setting_802_1x_get_private_key_password
+const char *            nm_setting_802_1x_get_private_key_password
+                                                        (NMSetting8021x *setting);
+NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_path
+const char *            nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -179,67 +188,27 @@ const char *        NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *        nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
-enum                NMSetting8021xCKType;
-const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_ca_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_client_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_private_key_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         const char *password,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
+const char *            nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_private_key
+NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         const char *password,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);
-NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
+NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSetting8021xError
+

 
   GObject
    +----NMSetting
          +----NMSetting8021x
 

 

-

+

 
Properties

 
   "anonymous-identity"       gchar*                : Read / Write
@@ -249,6 +218,7 @@ const eap"                      GSList_gchararray_*   : Read / Write
   "identity"                 gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
+  "password-flags"           guint                 : Read / Write
   "phase1-fast-provisioning" gchar*                : Read / Write
   "phase1-peaplabel"         gchar*                : Read / Write
   "phase1-peapver"           gchar*                : Read / Write
@@ -259,12 +229,14 @@ const phase2-client-cert"       GArray_guchar_*       : Read / Write
   "phase2-private-key"       GArray_guchar_*       : Read / Write
   "phase2-private-key-password" gchar*                : Read / Write
+  "phase2-private-key-password-flags" guint                 : Read / Write
   "private-key"              GArray_guchar_*       : Read / Write
   "private-key-password"     gchar*                : Read / Write
+  "private-key-password-flags" guint                 : Read / Write
   "system-ca-certs"          gboolean              : Read / Write / Construct
 

 

-

+

 
Description

 

 The NMSetting8021x object is a NMSetting subclass that describes
@@ -295,9 +267,9 @@ following books.
       ISBN: 978-1587051548
 

 

-

+

 
Details

-

+

 
enum NMSetting8021xCKFormat

 
typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -307,10 +279,39 @@ following books.
 } NMSetting8021xCKFormat;
 

 

+NMSetting8021xCKFormat values indicate the general type of a certificate
+or private key
 

+

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


NM_SETTING_802_1X_CK_FORMAT_UNKNOWN
unknown file format
+
NM_SETTING_802_1X_CK_FORMAT_X509
file contains an X.509 format certificate
+
NM_SETTING_802_1X_CK_FORMAT_RAW_KEY
file contains an old-style OpenSSL PEM
+or DER private key
+
NM_SETTING_802_1X_CK_FORMAT_PKCS12
file contains a PKCS12 certificate
+and private key
+

 

 

-

+

 
enum NMSetting8021xCKScheme

 
typedef enum {
 	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
@@ -319,10 +320,36 @@ following books.
 } NMSetting8021xCKScheme;
 

 

+NMSetting8021xCKScheme values indicate how a certificate or private key is
+stored in the setting properties, either as a blob of the item's data, or as
+a path to a certificate or private key file on the filesystem
 

+

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


NM_SETTING_802_1X_CK_SCHEME_UNKNOWN
unknown certificate or private key
+scheme
+
NM_SETTING_802_1X_CK_SCHEME_BLOB
certificate or key is stored as the raw
+item data
+
NM_SETTING_802_1X_CK_SCHEME_PATH
certificate or key is stored as a path
+to a file containing the certificate or key data
+

 

 

-

+

 
NM_SETTING_802_1X_SETTING_NAME

 
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 

@@ -330,7 +357,7 @@ following books.
 

 

 

-

+

 
enum NMSetting8021xError

 
typedef enum
 {
@@ -343,7 +370,7 @@ following books.
 

 

 

-

+

 
NM_TYPE_SETTING_802_1X_ERROR

 
#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ()) 
 

@@ -351,7 +378,7 @@ following books.
 

 

 

-

+

 
NM_SETTING_802_1X_ERROR

 
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 

@@ -359,7 +386,7 @@ following books.
 

 

 

-

+

 
nm_setting_802_1x_error_quark ()

 
GQuark              nm_setting_802_1x_error_quark       (void);

 

@@ -369,13 +396,12 @@ Registers an error quark for 
 
 
Returns :

- the error quark used for NMSetting8021x errors.
-
+the error quark used for NMSetting8021x errors.
 
 

 

 

-

+

 
NM_SETTING_802_1X_EAP

 
#define NM_SETTING_802_1X_EAP "eap"
 

@@ -383,7 +409,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_IDENTITY

 
#define NM_SETTING_802_1X_IDENTITY "identity"
 

@@ -391,7 +417,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

 
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 

@@ -399,7 +425,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_CA_CERT

 
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 

@@ -407,7 +433,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_CA_PATH

 
#define NM_SETTING_802_1X_CA_PATH "ca-path"
 

@@ -415,7 +441,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_CLIENT_CERT

 
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

@@ -423,7 +449,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE1_PEAPVER

 
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 

@@ -431,7 +457,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE1_PEAPLABEL

 
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

@@ -439,7 +465,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

 
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 

@@ -447,7 +473,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_AUTH

 
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

@@ -455,7 +481,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_AUTHEAP

 
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 

@@ -463,7 +489,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_CA_CERT

 
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 

@@ -471,7 +497,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_CA_PATH

 
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 

@@ -479,7 +505,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

 
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

@@ -487,7 +513,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PASSWORD

 
#define NM_SETTING_802_1X_PASSWORD "password"
 

@@ -495,7 +521,15 @@ Registers an error quark for 
+

+
NM_SETTING_802_1X_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+

+

+

+

+

+

 
NM_SETTING_802_1X_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 

@@ -503,7 +537,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 

@@ -511,7 +545,15 @@ Registers an error quark for 
+

+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+

+

+

+

+

+

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 

@@ -519,7 +561,7 @@ Registers an error quark for 
+

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 

@@ -527,7 +569,15 @@ Registers an error quark for 
+

+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+

+

+

+

+

+

 
NM_SETTING_802_1X_PIN

 
#define NM_SETTING_802_1X_PIN "pin"
 

@@ -535,15 +585,15 @@ Registers an error quark for 
-
NM_SETTING_802_1X_PSK

-
#define NM_SETTING_802_1X_PSK "psk"
+

+
NM_SETTING_802_1X_PIN_FLAGS

+
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 

 

 

 

 

-

+

 
NM_SETTING_802_1X_SYSTEM_CA_CERTS

 
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 

@@ -551,14 +601,14 @@ Registers an error quark for 
+

 
NMSetting8021x

 
typedef struct _NMSetting8021x NMSetting8021x;

 

 

 

 

-

+

 
NMSetting8021xClass

 
typedef struct {
 	NMSettingClass parent;
@@ -574,22 +624,14 @@ Registers an error quark for 
+

 
nm_setting_802_1x_get_type ()

 
GType               nm_setting_802_1x_get_type          (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_802_1x_new ()

 
NMSetting *         nm_setting_802_1x_new               (void);

 

@@ -599,13 +641,12 @@ Creates a new 
 
 
 
Returns :

- the new empty NMSetting8021x object
-
+the new empty NMSetting8021x object
 
 

 

 

-

+

 
nm_setting_802_1x_get_num_eap_methods ()

 
guint32             nm_setting_802_1x_get_num_eap_methods
                                                         (NMSetting8021x *setting);

@@ -626,14 +667,13 @@ allowed EAP methods.
 
 
 
Returns :

- the number of allowed EAP methods
-
+the number of allowed EAP methods
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_eap_method ()

 
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);

@@ -650,19 +690,18 @@ Returns the name of the allowed EAP method at index 
 
 
 
i :

-the index of the EAP method name to return
-
+the index of the EAP method name to return
 
 
 
Returns :

- the name of the allowed EAP method at index i
+the name of the allowed EAP method at index i
 
 
 
 

 

 

-

+

 
nm_setting_802_1x_add_eap_method ()

 
gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);

@@ -681,20 +720,18 @@ allowed EAP methods.
 
 
 
eap :

-the name of the EAP method to allow for this connection
-
+the name of the EAP method to allow for this connection
 
 
 
Returns :

- TRUE if the EAP method was successfully added, FALSE if it was
- not a valid method or if it was already allowed.
-
+TRUE if the EAP method was successfully added, FALSE if it was
+not a valid method or if it was already allowed.
 
 
 

 

 

-

+

 
nm_setting_802_1x_remove_eap_method ()

 
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
                                                          guint32 i);

@@ -711,14 +748,13 @@ Removes the allowed EAP method at the specified index.
 
 
 
i :

-the index of the EAP method to remove
-
+the index of the EAP method to remove
 
 
 

 

 

-

+

 
nm_setting_802_1x_clear_eap_methods ()

 
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

 

@@ -734,7 +770,7 @@ Clears all allowed EAP methods.
 

 

 

-

+

 
nm_setting_802_1x_get_identity ()

 
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

 

@@ -751,14 +787,13 @@ authenticate the user.  Often this is a username or login name.
 
 
 
Returns :

- the user identifier
-
+the user identifier
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_anonymous_identity ()

 
const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (NMSetting8021x *setting);

@@ -778,14 +813,13 @@ a secure form, if applicable for that EAP method.
 
 
 
Returns :

- the anonymous identifier
-
+the anonymous identifier
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_system_ca_certs ()

 
gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);

@@ -807,14 +841,13 @@ of these properties.
 
 
 
Returns :

- TRUE if a system CA certificate path should be used, FALSE if not
-
+TRUE if a system CA certificate path should be used, FALSE if not
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_path ()

 
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

 

@@ -834,14 +867,13 @@ certificates for verifying the network to client.
 
 
 
Returns :

- the CA certificate directory path
-
+the CA certificate directory path
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_path ()

 
const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);

@@ -862,21 +894,20 @@ to add more CA certificates for verifying the network to client.
 
 
 
Returns :

- the "phase 2" CA certificate directory path
-
+the "phase 2" CA certificate directory path
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the CA certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
 

 
@@ -888,19 +919,19 @@ if NM_SETTING_802_1X_CK_SCHEME_PATH, use Returns :

-
+

 

 scheme used to store the CA certificate (blob or path)
-scheme used to store the CA certificate (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

+
const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
+                                                        (NMSetting8021x *setting);

 

 Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -916,19 +947,19 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

- the CA certificate data
-
+the CA certificate data
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

+
const char *            nm_setting_802_1x_get_ca_cert_path
+                                                        (NMSetting8021x *setting);

 

 Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
 CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -944,14 +975,13 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

- path to the CA certificate file
-
+path to the CA certificate file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_ca_cert ()

 
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
                                                          const char *value,
@@ -960,9 +990,9 @@ of the network cannot be confirmed by the client.
                                                          GError **error);

 

 Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 
@@ -974,45 +1004,40 @@ scheme, or with the path to the certificate file if using the
 
-
+
-
+
-
+
-
+
-
+

 

 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
-  (PEM or DER format).  The path must be UTF-8 encoded; use
-  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-  clears the CA certificate.
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate file
+(PEM or DER format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the CA certificate.
 

 

 
scheme :
desired storage scheme for the certificate
-desired storage scheme for the certificate
 

 

 
out_format :
on successful return, the type of the certificate added
-on successful return, the type of the certificate added
 

 

 
error :
on unsuccessful return, an error
-on unsuccessful return, an error
 

 

 
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
 

 
@@ -1024,16 +1049,15 @@ if NM_SETTING_802_1X_CK_SCHEME_PATH, use Returns :

-
+

 

 scheme used to store the client certificate (blob or path)
-scheme used to store the client certificate (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
+
const GByteArray *      nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1050,16 +1074,15 @@ authentication method.
 
 
 
Returns :

- the client certificate data
-
+the client certificate data
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_client_cert_path ()

-
const char *        nm_setting_802_1x_get_client_cert_path
+
const char *            nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1076,14 +1099,13 @@ authentication method.
 
 
 
Returns :

- path to the client certificate file
-
+path to the client certificate file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_client_cert ()

 
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1093,8 +1115,8 @@ authentication method.
 

 Reads a certificate from disk and sets the "client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 

 Client certificates are used to identify the connecting client to the network
@@ -1111,38 +1133,33 @@ authentication method.
 
 
 
value :

-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
-  file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-  clears the client certificate.
-
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client certificate
+file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the client certificate.
 
 
 
scheme :

-desired storage scheme for the certificate
-
+desired storage scheme for the certificate
 
 
 
out_format :

-on successful return, the type of the certificate added
-
+on successful return, the type of the certificate added
 
 
 
error :

-on unsuccessful return, an error
-
+on unsuccessful return, an error
 
 
 
Returns :

- TRUE if the operation succeeded, FALSE if it was unsuccessful
-
+TRUE if the operation succeeded, FALSE if it was unsuccessful
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_peapver ()

 
const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);

@@ -1156,16 +1173,15 @@ authentication method.
 
 
 
Returns :

- the "phase 1" PEAP version to be used when authenticating with
- EAP-PEAP as contained in the "phase1-peapver" property.  Valid
- values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
-
+the "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the "phase1-peapver" property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_peaplabel ()

 
const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);

@@ -1179,18 +1195,17 @@ authentication method.
 
 
 
Returns :

- whether the "phase 1" PEAP label is new-style or old-style, to be
- used when authenticating with EAP-PEAP, as contained in the
- "phase1-peaplabel" property.  Valid values are NULL (unset),
- "0" (use old-style label), and "1" (use new-style label).  See the
- wpa_supplicant documentation for more details.
-
+whether the "phase 1" PEAP label is new-style or old-style, to be
+used when authenticating with EAP-PEAP, as contained in the
+"phase1-peaplabel" property.  Valid values are NULL (unset),
+"0" (use old-style label), and "1" (use new-style label).  See the
+wpa_supplicant documentation for more details.
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase1_fast_provisioning ()

 
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);

@@ -1204,16 +1219,15 @@ authentication method.
 
 
 
Returns :

- whether "phase 1" PEAP fast provisioning should be used, as specified
- by the "phase1-fast-provisioning" property.  See the
- wpa_supplicant documentation for more details.
-
+whether "phase 1" PEAP fast provisioning should be used, as specified
+by the "phase1-fast-provisioning" property.  See the
+wpa_supplicant documentation for more details.
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_auth ()

 
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

 

@@ -1226,15 +1240,14 @@ authentication method.
 
-
+

 

 
Returns :
 the "phase 2" non-EAP (ex MD5) allowed authentication method as
-  specified by the "phase2-auth" property.
-the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the "phase2-auth" property.
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_autheap ()

 
const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);

@@ -1248,22 +1261,21 @@ authentication method.
 
 
 
Returns :

- the "phase 2" EAP-based (ex TLS) allowed authentication method as
-  specified by the "phase2-autheap" property.
-
+the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the "phase2-autheap" property.
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().
 

 

@@ -1276,20 +1288,19 @@ use Returns :

-
+
 scheme used to store the "phase 2" CA certificate (blob or path)
-scheme used to store the "phase 2" CA certificate (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
+
const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);

 

 Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1305,20 +1316,19 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

- the "phase 2" CA certificate data
-
+the "phase 2" CA certificate data
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_cert_path
+
const char *            nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);

 

 Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
+using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
 a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
@@ -1334,14 +1344,13 @@ of the network cannot be confirmed by the client.
 
 
 
Returns :

- path to the "phase 2" CA certificate file
-
+path to the "phase 2" CA certificate file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_ca_cert ()

 
gboolean            nm_setting_802_1x_set_phase2_ca_cert
                                                         (NMSetting8021x *setting,
@@ -1352,8 +1361,8 @@ of the network cannot be confirmed by the client.
 

 Reads a certificate from disk and sets the "phase2-ca-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 
@@ -1365,46 +1374,41 @@ file if using the NM_SETTING_802_1X_CK_SCHEME_PATH
-
+
-
+
-
+
-
+
-
+

 

 
 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
-  certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-  clears the "phase2" CA certificate.
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
+certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the "phase2" CA certificate.
 

 

 
scheme :
desired storage scheme for the certificate
-desired storage scheme for the certificate
 

 

 
out_format :
on successful return, the type of the certificate added
-on successful return, the type of the certificate added
 

 

 
error :
on unsuccessful return, an error
-on unsuccessful return, an error
 

 

 
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1417,16 +1421,15 @@ returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB
-
+

 
 

 
Returns :
 scheme used to store the "phase 2" client certificate (blob or path)
-scheme used to store the "phase 2" client certificate (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+
const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1443,16 +1446,15 @@ authentication method.
 
 
 
Returns :

- the "phase 2" client certificate data
-
+the "phase 2" client certificate data
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_client_cert_path
+
const char *            nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);

 

 Client certificates are used to identify the connecting client to the network
@@ -1469,14 +1471,13 @@ authentication method.
 
 
 
Returns :

- path to the "phase 2" client certificate file
-
+path to the "phase 2" client certificate file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_client_cert ()

 
gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
@@ -1487,8 +1488,8 @@ authentication method.
 

 Reads a certificate from disk and sets the "phase2-client-cert"
 property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 

 Client certificates are used to identify the connecting client to the network
@@ -1505,38 +1506,33 @@ authentication method.
 
 
 
value :

-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
-  certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-  encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-  any scheme clears the "phase2" client certificate.
-
+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
+certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+any scheme clears the "phase2" client certificate.
 
 
 
scheme :

-desired storage scheme for the certificate
-
+desired storage scheme for the certificate
 
 
 
out_format :

-on successful return, the type of the certificate added
-
+on successful return, the type of the certificate added
 
 
 
error :

-on unsuccessful return, an error
-
+on unsuccessful return, an error
 
 
 
Returns :

- TRUE if the operation succeeded, FALSE if it was unsuccessful
-
+TRUE if the operation succeeded, FALSE if it was unsuccessful
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_password ()

 
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

 

@@ -1549,15 +1545,35 @@ authentication method.
 
-
+
+
+

 

 
Returns :
 the password used by the authentication method, if any, as specified
-  by the "password" property
+the password used by the authentication method, if any, as specified
+by the "password" property

+

+

+

+
nm_setting_802_1x_get_password_flags ()

+
NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
+                                                        (NMSetting8021x *setting);

+

++
+
+
+
+
+
+
+


setting :
the NMSetting8021x
+
Returns :
the NMSettingSecretFlags pertaining to the "password"
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_pin ()

 
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

 

@@ -1570,17 +1586,16 @@ authentication method.
 
-
+

 

 
Returns :
 the PIN used by the authentication method, if any, as specified
-  by the "pin" property
-the PIN used by the authentication method, if any, as specified
+by the "pin" property
 

 
 

 

 

-

-
nm_setting_802_1x_get_psk ()

-
const char *        nm_setting_802_1x_get_psk           (NMSetting8021x *setting);

+

+
nm_setting_802_1x_get_pin_flags ()

+
NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);

 

@@ -1591,23 +1606,23 @@ authentication method.
 
-

 
 
 

 
Returns :
 the Pre-Shared-Key used by the authentication method, if any, as
-  specified by the "psk" property
+the NMSettingSecretFlags pertaining to the
+"pin"
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the private key.  If the returned scheme is
-NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1620,22 +1635,26 @@ Returns the scheme used to store the private key.  If the returned scheme is
 
-
+

 

 
Returns :
 scheme used to store the private key (blob or path)
-scheme used to store the private key (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_private_key_blob
+
const GByteArray *      nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

+

+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+

 

@@ -1646,16 +1665,15 @@ authentication method.
 
-
+

 
 
 

 
Returns :
 the private key data
-the private key data
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_path ()

-
const char *        nm_setting_802_1x_get_private_key_path
+
const char *            nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
@@ -1672,14 +1690,13 @@ authentication method.
 
 
 
Returns :

- path to the private key file
-
+path to the private key file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_private_key ()

 
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *value,
@@ -1688,16 +1705,31 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

-Reads a private key from disk and sets the "private-key"
-property with the raw private key data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

+

+This function reads a private key from disk and sets the
+"private-key" property with the private key file data if using
+the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
+key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

+If password is given, this function attempts to decrypt the private key to
+verify that password is correct, and if it is, updates the
+"private-key-password" property with the given password.  If
+the decryption is unsuccessful, FALSE is returned, error is set, and no
+internal data is changed.  If no password is given, the private key is
+assumed to be valid, no decryption is performed, and the password may be set
+at a later time.
+

+

+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
+

 

@@ -1708,45 +1740,64 @@ authentication method.
 
-
+
-
+
-
+
-
+
-
+
-
+

 
 
 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
-  (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-  g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-  clears the private key.
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
+(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the private key.
 

 

 
password :
password used to decrypt the private key
-password used to decrypt the private key, or NULL if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.
 

 

 
scheme :
desired storage scheme for the private key
-desired storage scheme for the private key
 

 

 
out_format :
on successful return, the type of the private key added
-on successful return, the type of the private key added
 

 

 
error :
on unsuccessful return, an error
-on unsuccessful return, an error
 

 

 
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_password ()

-
const char *        nm_setting_802_1x_get_private_key_password
+
const char *            nm_setting_802_1x_get_private_key_password
+                                                        (NMSetting8021x *setting);

+

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


setting :
the NMSetting8021x
+
Returns :
the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_private_key_from_file(),
+nm_setting_802_1x_set_private_key_path(), or the
+"private-key-password" property.

+

+

+

+
nm_setting_802_1x_get_private_key_password_flags ()

+
NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);

 
@@ -1758,17 +1809,15 @@ authentication method.
 
-

 

 

 
Returns :
 the private key password used to decrypt the private key if
- previously set with nm_setting_802_1x_set_private_key_from_file(),
- nm_setting_802_1x_set_private_key_path(), or the
- "private-key-password" property.
+the NMSettingSecretFlags pertaining to the
+"private-key-password"
 
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_private_key_format ()

 
NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);

@@ -1782,23 +1831,22 @@ authentication method.
 
 
 
Returns :

- the data format of the private key data stored in the
-  "private-key" property
-
+the data format of the private key data stored in the
+"private-key" property
 
 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_scheme ()

 
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

 

@@ -1811,22 +1859,26 @@ scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
 
-
+

 

 
Returns :
 scheme used to store the "phase 2" private key (blob or path)
-scheme used to store the "phase 2" private key (blob or path)
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+
const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

+

+WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+

 

@@ -1837,16 +1889,15 @@ authentication method.
 
-
+

 
 
 

 
Returns :
 the "phase 2" private key data
-the "phase 2" private key data
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_path
+
const char *            nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);

 

 Private keys are used to authenticate the connecting client to the network
@@ -1863,14 +1914,13 @@ authentication method.
 
 
 
Returns :

- path to the "phase 2" private key file
-
+path to the "phase 2" private key file
 
 
 

 

 

-

+

 
nm_setting_802_1x_set_phase2_private_key ()

 
gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
@@ -1880,16 +1930,31 @@ authentication method.
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

-Reads a "phase 2" private key from disk and sets the
-"phase2-private-key" property with the raw private key data if
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
-private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

 Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

+

+This function reads a private key from disk and sets the
+"phase2-private-key" property with the private key file data if
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
+private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

+If password is given, this function attempts to decrypt the private key to
+verify that password is correct, and if it is, updates the
+"phase2-private-key-password" property with the given
+password.  If the decryption is unsuccessful, FALSE is returned, error is
+set, and no internal data is changed.  If no password is given, the private
+key is assumed to be valid, no decryption is performed, and the password may
+be set at a later time.
+

+

+WARNING: the "phase2" private key property is not a "secret" property, and
+thus unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
+

 

@@ -1900,45 +1965,41 @@ authentication method.
 
-
+
-
+
-
+
-
+
-
+
-
+

 
 
 

 
value :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-  NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private 
-  key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
-  use g_filename_to_utf8() to convert if needed.  Passing NULL with any
-  scheme clears the "phase2" private key.
-when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
+key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+scheme clears the private key.
 

 

 
password :
password used to decrypt the private key
-password used to decrypt the private key, or NULL if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.
 

 

 
scheme :
desired storage scheme for the private key
-desired storage scheme for the private key
 

 

 
out_format :
on successful return, the type of the private key added
-on successful return, the type of the private key added
 

 

 
error :
on unsuccessful return, an error
-on unsuccessful return, an error
 

 

 
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

-

+

 
nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_password
+
const char *            nm_setting_802_1x_get_phase2_private_key_password
                                                         (NMSetting8021x *setting);

 
@@ -1950,19 +2011,18 @@ authentication method.
 
-
+

 

 

 
Returns :
 the private key password used to decrypt the private key if
- previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
- nm_setting_802_1x_set_phase2_private_key_path(), or the
- "phase2-private-key-password" property.
-the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_phase2_private_key_from_file(),
+nm_setting_802_1x_set_phase2_private_key_path(), or the
+"phase2-private-key-password" property.
 

 
 

 

 

-

-
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
+

+
nm_setting_802_1x_get_phase2_private_key_password_flags ()

+
NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
                                                         (NMSetting8021x *setting);

 
@@ -1974,44 +2034,18 @@ authentication method.
 
-

 

 

 
Returns :
 the data format of the "phase 2" private key data stored in the
-  "phase2-private-key" property
+the NMSettingSecretFlags pertaining to the
+"phase2-private-key-password"
 
 

 
 

 

 

-

-
enum NMSetting8021xCKType

-
typedef enum {
-	NM_SETTING_802_1X_CK_TYPE_UNKNOWN = 0,
-	NM_SETTING_802_1X_CK_TYPE_X509,
-	NM_SETTING_802_1X_CK_TYPE_RAW_KEY,
-	NM_SETTING_802_1X_CK_TYPE_PKCS12
-} NMSetting8021xCKType;
-

-

-

-

-

-

-
nm_setting_802_1x_get_ca_cert ()

-
const GByteArray *  nm_setting_802_1x_get_ca_cert       (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_ca_cert_blob().

-

-

-Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

+

+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);

 

@@ -2022,603 +2056,48 @@ of the network cannot be confirmed by the client.
 
-
+

 
 
 

 
Returns :
 the CA certificate data
-the data format of the "phase 2" private key data stored in the
+"phase2-private-key" property
 

 
 

 

+

+

+
Property Details

+

+
The "anonymous-identity" property

+
  "anonymous-identity"       gchar*                : Read / Write

+

+Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.
+

+
Default value: NULL

+

 

-

-
nm_setting_802_1x_set_ca_cert_from_file ()

-
gboolean            nm_setting_802_1x_set_ca_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_ca_cert() with the
-  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

+

+
The "ca-cert" property

+
  "ca-cert"                  GArray_guchar_*       : Read / Write

+

+Contains the CA certificate if used by the EAP method specified in the
+"eap" property.  Setting this property directly is
+discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
+

 

+

+

+
The "ca-path" property

+
  "ca-path"                  gchar*                : Read / Write

 

-Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data using the NM_SETTING_802_1X_CK_SCHEME_BLOB
-scheme.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
the path of the CA certificate file (PEM or DER format). Passing
-  NULL clears the CA certificate.
-
out_ck_type :
on successful return, the type of the certificate added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_client_cert ()

-
const GByteArray *  nm_setting_802_1x_get_client_cert   (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_client_cert_blob().

-

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the client certificate data
-

-

-

-

-
nm_setting_802_1x_set_client_cert_from_file ()

-
gboolean            nm_setting_802_1x_set_client_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_client_cert() with the
-  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

-

-

-Reads a certificate from disk and sets the "client-cert"
-property with the raw certificate data.
-

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
the path of the client certificate file (PEM, DER, or
-  PKCS12 format).  Passing NULL clears the client certificate.
-
out_ck_type :
on successful return, the type of the certificate added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_phase2_ca_cert ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert
-                                                        (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_phase2_ca_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_phase2_ca_cert_blob().

-

-

-Returns the "phase 2" CA certificate blob.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the "phase 2" CA certificate data
-

-

-

-

-
nm_setting_802_1x_set_phase2_ca_cert_from_file ()

-
gboolean            nm_setting_802_1x_set_phase2_ca_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_phase2_ca_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_phase2_ca_cert().
-  with the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

-

-

-Reads a certificate from disk and sets the "phase2-ca-cert"
-property with the raw certificate data.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
the path of the "phase2" CA certificate file (PEM or DER format).
-  Passing NULL with any scheme clears the "phase2" CA certificate.
-
out_ck_type :
on successful return, the type of the certificate added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_phase2_client_cert ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert
-                                                        (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_phase2_client_cert has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_phase2_client_cert_blob().

-

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the "phase 2" client certificate data
-

-

-

-

-
nm_setting_802_1x_set_phase2_client_cert_from_file ()

-
gboolean            nm_setting_802_1x_set_phase2_client_cert_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_phase2_client_cert_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_phase2_client_cert() with the.
-  NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

-

-

-Reads a certificate from disk and sets the "phase2-client-cert"
-property with the raw certificate data.
-

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
pass the path of the "phase2" client certificate file (PEM, DER,
-  or PKCS12 format).  Passing NULL clears the "phase2" client certificate.
-
out_ck_type :
on successful return, the type of the certificate added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_private_key ()

-
const GByteArray *  nm_setting_802_1x_get_private_key   (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_private_key_blob().

-

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the private key data
-

-

-

-

-
nm_setting_802_1x_set_private_key_from_file ()

-
gboolean            nm_setting_802_1x_set_private_key_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         const char *password,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_private_key() with.
-  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

-

-

-Reads a private key from disk and sets the "private-key"
-property with the raw private key data.
-

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
the path of the private key file (PEM, DER, or PKCS12 format).
-  Passing NULL clears the private key.
-
password :
password used to decrypt the private key
-
out_ck_type :
on successful return, the type of the private key added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_private_key_type ()

-
NMSetting8021xCKType  nm_setting_802_1x_get_private_key_type
-                                                        (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_private_key_format().

-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the data format of the private key data stored in the
-  "private-key" property
-

-

-

-

-
nm_setting_802_1x_get_phase2_private_key ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_private_key
-                                                        (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_phase2_private_key has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_private_key_blob().

-

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the "phase 2" private key data
-

-

-

-

-
nm_setting_802_1x_set_phase2_private_key_from_file ()

-
gboolean            nm_setting_802_1x_set_phase2_private_key_from_file
-                                                        (NMSetting8021x *setting,
-                                                         const char *filename,
-                                                         const char *password,
-                                                         NMSetting8021xCKType *out_ck_type,
-                                                         GError **error);

-

-
Warning

-
nm_setting_802_1x_set_phase2_private_key_from_file has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_set_phase2_private_key() with
-  the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.

-

-

-Reads a "phase 2" private key from disk and sets the
-"phase2-private-key" property with the raw private key data.
-

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
filename :
the path of the "phase2" private key file (PEM, DER, or PKCS12
-  format).  Passing NULL clears the "phase2" private key.
-
password :
password used to decrypt the private key
-
out_ck_type :
on successful return, the type of the private key added
-
error :
on unsuccessful return, an error
-
Returns :
 TRUE if the operation succeeded, FALSE if it was unsuccessful
-

-

-

-

-
nm_setting_802_1x_get_phase2_private_key_type ()

-
NMSetting8021xCKType  nm_setting_802_1x_get_phase2_private_key_type
-                                                        (NMSetting8021x *setting);

-

-
Warning

-
nm_setting_802_1x_get_phase2_private_key_type has been deprecated since version 0.8 and should not be used in newly-written code. This function has been deprecated and should
-  not be used in newly written code. Calling this function is
-  equivalent to calling nm_setting_802_1x_get_phase2_private_key_format().

-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
 the data format of the private key data stored in the
-  "phase2-private-key" property
-

-

-

-

-
Property Details

-

-
The "anonymous-identity" property

-
  "anonymous-identity"       gchar*                : Read / Write

-

-Anonymous identity string for EAP authentication methods.  Used as the
-unencrypted identity with EAP types that support different tunneled
-identity like EAP-TTLS.
-

-
Default value: NULL

-

-

-

-
The "ca-cert" property

-
  "ca-cert"                  GArray_guchar_*       : Read / Write

-

-Contains the CA certificate if used by the EAP method specified in the
-"eap" property.  Setting this property directly is
-discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
-

-

-

-

-
The "ca-path" property

-
  "ca-path"                  gchar*                : Read / Write

-

-UTF-8 encoded path to a directory containing PEM or DER formatted
-certificates to be added to the verification chain in addition to the
-certificate specified in the "ca-cert" property.
+UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the "ca-cert" property.
 

 
Default value: NULL

 

 

-

+

 
The "client-cert" property

 
  "client-cert"              GArray_guchar_*       : Read / Write

 

@@ -2628,7 +2107,7 @@ discouraged; use the 
+

 
The "eap" property

 
  "eap"                      GSList_gchararray_*   : Read / Write

 

@@ -2640,7 +2119,7 @@ allowed combinations.
 

 

 

-

+

 
The "identity" property

 
  "identity"                 gchar*                : Read / Write

 

@@ -2650,7 +2129,7 @@ user or login name.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -2659,7 +2138,17 @@ Password used for EAP authentication methods.
 
Default value: NULL

 

 

-

+

+
The "password-flags" property

+
  "password-flags"           guint                 : Read / Write

+

+Flags indicating how to handle "password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "phase1-fast-provisioning" property

 
  "phase1-fast-provisioning" gchar*                : Read / Write

 

@@ -2673,7 +2162,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase1-peaplabel" property

 
  "phase1-peaplabel"         gchar*                : Read / Write

 

@@ -2685,7 +2174,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase1-peapver" property

 
  "phase1-peapver"           gchar*                : Read / Write

 

@@ -2699,7 +2188,7 @@ version.
 
Default value: NULL

 

 

-

+

 
The "phase2-auth" property

 
  "phase2-auth"              gchar*                : Read / Write

 

@@ -2713,7 +2202,7 @@ authentication; see the wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase2-autheap" property

 
  "phase2-autheap"           gchar*                : Read / Write

 

@@ -2727,7 +2216,7 @@ wpa_supplicant documentation for more details.
 
Default value: NULL

 

 

-

+

 
The "phase2-ca-cert" property

 
  "phase2-ca-cert"           GArray_guchar_*       : Read / Write

 

@@ -2738,7 +2227,7 @@ Setting this property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-ca-path" property

 
  "phase2-ca-path"           gchar*                : Read / Write

 

@@ -2749,7 +2238,7 @@ certificate specified in the 
+

 
The "phase2-client-cert" property

 
  "phase2-client-cert"       GArray_guchar_*       : Read / Write

 

@@ -2760,7 +2249,7 @@ properties.  Setting this property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-private-key" property

 
  "phase2-private-key"       GArray_guchar_*       : Read / Write

 

@@ -2774,7 +2263,7 @@ property directly is discouraged; use the
 

 

 

-

+

 
The "phase2-private-key-password" property

 
  "phase2-private-key-password" gchar*                : Read / Write

 

@@ -2788,7 +2277,17 @@ the private key by the 
+

+
The "phase2-private-key-password-flags" property

+
  "phase2-private-key-password-flags" guint                 : Read / Write

+

+Flags indicating how to handle "phase2-private-key-password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "private-key" property

 
  "private-key"              GArray_guchar_*       : Read / Write

 

@@ -2796,9 +2295,16 @@ Contains the private key if the nm_setting_802_1x_set_private_key() function instead.
 

+

+WARNING: "private-key" is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.
+

 

 

-

+

 
The "private-key-password" property

 
  "private-key-password"     gchar*                : Read / Write

 

@@ -2812,7 +2318,17 @@ the private key by the 
+

+
The "private-key-password-flags" property

+
  "private-key-password-flags" guint                 : Read / Write

+

+Flags indicating how to handle "private-key-password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "system-ca-certs" property

 
  "system-ca-certs"          gboolean              : Read / Write / Construct

 

@@ -2830,6 +2346,6 @@ addition to any certificates specified by the 
 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index 0dabd239..a6eae7b9 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_BLUETOOTH_SETTING_NAME
-enum                NMSettingBluetoothError;
+
#define             NM_SETTING_BLUETOOTH_SETTING_NAME
+enum                NMSettingBluetoothError;
 #define             NM_TYPE_SETTING_BLUETOOTH_ERROR
 #define             NM_SETTING_BLUETOOTH_ERROR
 GQuark              nm_setting_bluetooth_error_quark    (void);
@@ -59,29 +59,33 @@ const char *        NMSettingBluetooth *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBluetoothError
+

 
   GObject
    +----NMSetting
          +----NMSettingBluetooth
 

 

-

+

 
Properties

 
   "bdaddr"                   GArray_guchar_*       : Read / Write
   "type"                     gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

@@ -89,7 +93,7 @@ const char *        
+

 
enum NMSettingBluetoothError

 
typedef enum
 {
@@ -103,7 +107,7 @@ const char *        
+

 
NM_TYPE_SETTING_BLUETOOTH_ERROR

 
#define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ()) 
 

@@ -111,7 +115,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_ERROR

 
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 

@@ -119,22 +123,14 @@ const char *        
+

 
nm_setting_bluetooth_error_quark ()

 
GQuark              nm_setting_bluetooth_error_quark    (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_BLUETOOTH_BDADDR

 
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

@@ -142,7 +138,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE

 
#define NM_SETTING_BLUETOOTH_TYPE      "type"
 

@@ -150,7 +146,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE_DUN

 
#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
 

@@ -158,7 +154,7 @@ const char *        
+

 
NM_SETTING_BLUETOOTH_TYPE_PANU

 
#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 

@@ -166,14 +162,14 @@ const char *        
+

 
NMSettingBluetooth

 
typedef struct _NMSettingBluetooth NMSettingBluetooth;

 

 

 

 

-

+

 
NMSettingBluetoothClass

 
typedef struct {
 	NMSettingClass parent;
@@ -189,84 +185,38 @@ const char *        
+

 
nm_setting_bluetooth_get_type ()

 
GType               nm_setting_bluetooth_get_type       (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_bluetooth_new ()

 
NMSetting *         nm_setting_bluetooth_new            (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_bluetooth_get_bdaddr ()

 
const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_bluetooth_get_connection_type ()

 
const char *        nm_setting_bluetooth_get_connection_type
                                                         (NMSettingBluetooth *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "bdaddr" property

 
  "bdaddr"                   GArray_guchar_*       : Read / Write

 

@@ -274,7 +224,7 @@ The Bluetooth address of the device.
 

 

 

-

+

 
The "type" property

 
  "type"                     gchar*                : Read / Write

 

@@ -287,6 +237,6 @@ Either 'dun' for Dial-Up Networking connections (not yet supported) or
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 1704380c..3dc4a712 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,19 +39,20 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting-cdma.h>
 
 #define             NM_SETTING_CDMA_SETTING_NAME
-enum                NMSettingCdmaError;
+enum                NMSettingCdmaError;
 #define             NM_TYPE_SETTING_CDMA_ERROR
 #define             NM_SETTING_CDMA_ERROR
 GQuark              nm_setting_cdma_error_quark         (void);
 #define             NM_SETTING_CDMA_NUMBER
 #define             NM_SETTING_CDMA_USERNAME
 #define             NM_SETTING_CDMA_PASSWORD
+#define             NM_SETTING_CDMA_PASSWORD_FLAGS
                     NMSettingCdma;
                     NMSettingCdmaClass;
 GType               nm_setting_cdma_get_type            (void);
@@ -59,25 +60,32 @@ enum                char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
+NMSettingSecretFlags  nm_setting_cdma_get_password_flags
+                                                        (NMSettingCdma *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingCdmaError
+

 
   GObject
    +----NMSetting
          +----NMSettingCdma
 

 

-

+

 
Properties

 
   "number"                   gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
+  "password-flags"           guint                 : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 The NMSettingCdma object is a NMSetting subclass that describes
@@ -85,9 +93,9 @@ properties that allow connections to IS-95-based mobile broadband
 networks, including those using CDMA2000/EVDO technology.
 

 

-

+

 
Details

-

+

 
NM_SETTING_CDMA_SETTING_NAME

 
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

@@ -95,7 +103,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
enum NMSettingCdmaError

 
typedef enum
 {
@@ -109,7 +117,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
NM_TYPE_SETTING_CDMA_ERROR

 
#define NM_TYPE_SETTING_CDMA_ERROR (nm_setting_cdma_error_get_type ()) 
 

@@ -117,7 +125,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
NM_SETTING_CDMA_ERROR

 
#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
 

@@ -125,7 +133,7 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-

+

 
nm_setting_cdma_error_quark ()

 
GQuark              nm_setting_cdma_error_quark         (void);

 

@@ -135,44 +143,51 @@ Registers an error quark for 
 
 
Returns :

- the error quark used for NMSettingCdma errors.
-
+the error quark used for NMSettingCdma errors.
 
 

 

 

-

+

 
NM_SETTING_CDMA_NUMBER

-
#define NM_SETTING_CDMA_NUMBER       "number"
+
#define NM_SETTING_CDMA_NUMBER         "number"
 

 

 

 

 

-

+

 
NM_SETTING_CDMA_USERNAME

-
#define NM_SETTING_CDMA_USERNAME     "username"
+
#define NM_SETTING_CDMA_USERNAME       "username"
 

 

 

 

 

-

+

 
NM_SETTING_CDMA_PASSWORD

-
#define NM_SETTING_CDMA_PASSWORD     "password"
+
#define NM_SETTING_CDMA_PASSWORD       "password"
+

+

+

+

+

+

+
NM_SETTING_CDMA_PASSWORD_FLAGS

+
#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

-

+

 
NMSettingCdma

 
typedef struct _NMSettingCdma NMSettingCdma;

 

 

 

 

-

+

 
NMSettingCdmaClass

 
typedef struct {
 	NMSettingClass parent;
@@ -188,22 +203,14 @@ Registers an error quark for 
+

 
nm_setting_cdma_get_type ()

 
GType               nm_setting_cdma_get_type            (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_cdma_new ()

 
NMSetting *         nm_setting_cdma_new                 (void);

 

@@ -213,13 +220,12 @@ Creates a new 
 
 
Returns :

- the new empty NMSettingCdma object
-
+the new empty NMSettingCdma object
 
 

 

 

-

+

 
nm_setting_cdma_get_number ()

 
const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);

 

@@ -232,14 +238,13 @@ Creates a new 
 
-
+

 
Returns :
 the "number" property of the setting
-the "number" property of the setting
 

 
 

 

 

-

+

 
nm_setting_cdma_get_username ()

 
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

 

@@ -252,14 +257,13 @@ Creates a new 
 
-
+

 
Returns :
 the "username" property of the setting
-the "username" property of the setting
 

 
 

 

 

-

+

 
nm_setting_cdma_get_password ()

 
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

 

@@ -272,16 +276,36 @@ Creates a new 
 
-
+
+
+

 
Returns :
 the "password" property of the setting
+the "password" property of the setting

+

+

+

+
nm_setting_cdma_get_password_flags ()

+
NMSettingSecretFlags  nm_setting_cdma_get_password_flags
+                                                        (NMSettingCdma *setting);

+

++
+
+
+
+
+
+
+


setting :
the NMSettingCdma
+
Returns :
the NMSettingSecretFlags pertaining to the "password"
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "number" property

 
  "number"                   gchar*                : Read / Write

 

@@ -292,7 +316,7 @@ is used when required.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -303,7 +327,17 @@ password is required, it is specified here.
 
Default value: NULL

 

 

-

+

+
The "password-flags" property

+
  "password-flags"           guint                 : Read / Write

+

+Flags indicating how to handle "password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -317,6 +351,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index b84ed1bf..27c30ebd 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,13 +39,13 @@
 
 
 

-

+

 
Synopsis

-
+
 #include <nm-setting-connection.h>
 
 #define             NM_SETTING_CONNECTION_SETTING_NAME
-enum                NMSettingConnectionError;
+enum                NMSettingConnectionError;
 #define             NM_TYPE_SETTING_CONNECTION_ERROR
 #define             NM_SETTING_CONNECTION_ERROR
 GQuark              nm_setting_connection_error_quark   (void);
@@ -55,6 +55,7 @@ enum                NM_SETTING_CONNECTION_AUTOCONNECT
 #define             NM_SETTING_CONNECTION_TIMESTAMP
 #define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_PERMISSIONS
                     NMSettingConnection;
                     NMSettingConnectionClass;
 GType               nm_setting_connection_get_type      (void);
@@ -67,39 +68,63 @@ const char *        NMSettingConnection *setting);
 guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_permissions
+                                                        (NMSettingConnection *setting);
+gboolean            nm_setting_connection_get_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx,
+                                                         const char **out_ptype,
+                                                         const char **out_pitem,
+                                                         const char **out_detail);
+gboolean            nm_setting_connection_permissions_user_allowed
+                                                        (NMSettingConnection *setting,
+                                                         const char *uname);
+gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);
+void                nm_setting_connection_remove_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingConnectionError
+

 
   GObject
    +----NMSetting
          +----NMSettingConnection
 

 

-

+

 
Properties

 
   "autoconnect"              gboolean              : Read / Write / Construct
   "id"                       gchar*                : Read / Write
+  "permissions"              GSList_gchararray_*   : Read / Write
   "read-only"                gboolean              : Read / Write / Construct
   "timestamp"                guint64               : Read / Write / Construct
   "type"                     gchar*                : Read / Write
   "uuid"                     gchar*                : Read / Write
 

 

-

+

 
Description

 

 The NMSettingConnection object is a NMSetting subclass that describes
-properties that apply to all NMConnection objects, regardless of what type
-of network connection they describe.  Each NMConnection object must contain
+properties that apply to all NMConnection objects, regardless of what type
+of network connection they describe.  Each NMConnection object must contain
 a NMSettingConnection setting.
 

 

-

+

 
Details

-

+

 
NM_SETTING_CONNECTION_SETTING_NAME

 
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

@@ -107,7 +132,7 @@ a 
 

 

-

+

 
enum NMSettingConnectionError

 
typedef enum
 {
@@ -145,14 +170,14 @@ Describes errors that may result from operations involving a
 
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND

 the NMSetting object
   referenced by the setting name contained in the
-  "type" property was not present in the NMConnection
+  "type" property was not present in the NMConnection
 
 
 
 

 

 

-

+

 
NM_TYPE_SETTING_CONNECTION_ERROR

 
#define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ()) 
 

@@ -160,7 +185,7 @@ Describes errors that may result from operations involving a
 

 

 

-

+

 
NM_SETTING_CONNECTION_ERROR

 
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 

@@ -168,7 +193,7 @@ Describes errors that may result from operations involving a
 

 

 

-

+

 
nm_setting_connection_error_quark ()

 
GQuark              nm_setting_connection_error_quark   (void);

 

@@ -178,13 +203,12 @@ Registers an error quark for 
 
 
Returns :

- the error quark used for NMSettingConnection errors.
-
+the error quark used for NMSettingConnection errors.
 
 

 

 

-

+

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID          "id"
 

@@ -192,7 +216,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_UUID

 
#define NM_SETTING_CONNECTION_UUID        "uuid"
 

@@ -200,7 +224,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_TYPE

 
#define NM_SETTING_CONNECTION_TYPE        "type"
 

@@ -208,7 +232,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_AUTOCONNECT

 
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 

@@ -216,7 +240,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_TIMESTAMP

 
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 

@@ -224,7 +248,7 @@ Registers an error quark for 
 

 

-

+

 
NM_SETTING_CONNECTION_READ_ONLY

 
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
 

@@ -232,7 +256,15 @@ Registers an error quark for 
 

 

-

+

+
NM_SETTING_CONNECTION_PERMISSIONS

+
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+

+

+

+

+

+

 
NMSettingConnection

 
typedef struct _NMSettingConnection NMSettingConnection;

 

@@ -241,7 +273,7 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
NMSettingConnectionClass

 
typedef struct {
 	NMSettingClass parent;
@@ -257,22 +289,14 @@ It should only be accessed through the functions described below.
 

 

 

-

+

 
nm_setting_connection_get_type ()

 
GType               nm_setting_connection_get_type      (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_connection_new ()

 
NMSetting *         nm_setting_connection_new           (void);

 

@@ -282,13 +306,12 @@ Creates a new 
 
 
Returns :

- the new empty NMSettingConnection object
-
+the new empty NMSettingConnection object
 
 

 

 

-

+

 
nm_setting_connection_get_id ()

 
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

 

@@ -304,14 +327,13 @@ Returns the Returns :

- the connection ID
-
+the connection ID
 
 
 

 

 

-

+

 
nm_setting_connection_get_uuid ()

 
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

 

@@ -327,14 +349,13 @@ Returns the Returns :

- the connection UUID
-
+the connection UUID
 
 
 

 

 

-

+

 
nm_setting_connection_get_connection_type ()

 
const char *        nm_setting_connection_get_connection_type
                                                         (NMSettingConnection *setting);

@@ -351,14 +372,13 @@ Returns the Returns :

- the connection type
-
+the connection type
 
 
 

 

 

-

+

 
nm_setting_connection_get_autoconnect ()

 
gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);

@@ -375,14 +395,13 @@ Returns the Returns :

- the connection's autoconnect behavior
-
+the connection's autoconnect behavior
 
 
 

 

 

-

+

 
nm_setting_connection_get_timestamp ()

 
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

@@ -398,14 +417,13 @@ Returns the Returns :

- the connection's timestamp
-
+the connection's timestamp
 
 
 

 

 

-

+

 
nm_setting_connection_get_read_only ()

 
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

 

@@ -421,16 +439,184 @@ Returns the Returns :

- TRUE if the connection is read-only, FALSE if it is not
+
+TRUE if the connection is read-only, FALSE if it is not
+
+
+

+

+

+

+
nm_setting_connection_get_num_permissions ()

+
guint32             nm_setting_connection_get_num_permissions
+                                                        (NMSettingConnection *setting);

+

+Returns the number of entires in the "permissions"
+property of this setting.
+

+

++
+
+
+
+
+
+
+


setting :
the NMSettingConnection
 
 
Returns :
the number of permissions entires

 
 

 

+

+

+
nm_setting_connection_get_permission ()

+
gboolean            nm_setting_connection_get_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx,
+                                                         const char **out_ptype,
+                                                         const char **out_pitem,
+                                                         const char **out_detail);

+

+Retrieve one of the entries of the "permissions" property
+of this setting.
+

+

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


setting :
the NMSettingConnection
+
idx :
the zero-based index of the permissions entry
out_ptype :
on return, the permission type (at this time, always "user")
out_pitem :
on return, the permission item (formatted accoring to ptype, see
+"permissions" for more detail
out_detail :
on return, the permission detail (at this time, always NULL)
Returns :

+TRUE if a permission was returned, FALSE if idx was invalid

 

-

+

+

+
nm_setting_connection_permissions_user_allowed ()

+
gboolean            nm_setting_connection_permissions_user_allowed
+                                                        (NMSettingConnection *setting,
+                                                         const char *uname);

+

+Checks whether the given username is allowed to view/access this connection.
+

+

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


setting :
the NMSettingConnection
+
uname :
the user name to check permissions for
Returns :

+TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection

+

+

+

+
nm_setting_connection_add_permission ()

+
gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);

+

+Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and pitem must be a username. See
+"permissions": for more details.
+

+

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


setting :
the NMSettingConnection
+
ptype :
the permission type; at this time only "user" is supported
pitem :
the permission item formatted as required for ptype
+
detail :
unused at this time; must be NULL. [allow-none]
+
Returns :
TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype or pitem was invalid or it the permission was already
+present in the list

+

+

+

+
nm_setting_connection_remove_permission ()

+
void                nm_setting_connection_remove_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);

+

+Removes the permission at index idx from the connection.
+

+

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


setting :
the NMSettingConnection
+
idx :
the zero-based index of the permission to remove

+

+

+

 
Property Details

-

+

 
The "autoconnect" property

 
  "autoconnect"              gboolean              : Read / Write / Construct

 

@@ -442,7 +628,7 @@ intervention to activate the connection.  Defaults to 
+

 
The "id" property

 
  "id"                       gchar*                : Read / Write

 

@@ -452,7 +638,29 @@ A human readable unique idenfier for the connection, like "Work WiFi" or
 
Default value: NULL

 

 

-

+

+
The "permissions" property

+
  "permissions"              GSList_gchararray_*   : Read / Write

+

+An array of strings defining what access a given user has to this
+connection.  If this is NULL or empty, all users are allowed to access
+this connection.  Otherwise a user is allowed to access this connection
+if and only if they are in this list. Each entry is of the form
+"[type]:[id]:[reserved]", for example:
+

+

+   user:dcbw:blah
+

+

+At this time only the 'user' [type] is allowed.  Any other values are
+ignored and reserved for future use.  [id] is the username that this
+permission refers to, which may not contain the ':' character. Any
+[reserved] information present must be ignored and is reserved for
+future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+

+

+

+

 
The "read-only" property

 
  "read-only"                gboolean              : Read / Write / Construct

 

@@ -463,7 +671,7 @@ if the connection is read-only and cannot be modified.
 
Default value: FALSE

 

 

-

+

 
The "timestamp" property

 
  "timestamp"                guint64               : Read / Write / Construct

 

@@ -473,7 +681,7 @@ _successfully_ fully activated.
 
Default value: 0

 

 

-

+

 
The "type" property

 
  "type"                     gchar*                : Read / Write

 

@@ -485,7 +693,7 @@ type's parameters.  For example, for WiFi devices, the name of the
 
Default value: NULL

 

 

-

+

 
The "uuid" property

 
  "uuid"                     gchar*                : Read / Write

 

@@ -509,6 +717,6 @@ be generated by 
 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 47af8253..4a2d7925 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,29 +39,24 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_GSM_SETTING_NAME
-enum                NMSettingGsmError;
+
#define             NM_SETTING_GSM_SETTING_NAME
+enum                NMSettingGsmError;
 #define             NM_TYPE_SETTING_GSM_ERROR
 #define             NM_SETTING_GSM_ERROR
 GQuark              nm_setting_gsm_error_quark          (void);
 #define             NM_SETTING_GSM_NUMBER
 #define             NM_SETTING_GSM_USERNAME
 #define             NM_SETTING_GSM_PASSWORD
+#define             NM_SETTING_GSM_PASSWORD_FLAGS
 #define             NM_SETTING_GSM_APN
 #define             NM_SETTING_GSM_NETWORK_ID
 #define             NM_SETTING_GSM_NETWORK_TYPE
 #define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_PIN
+#define             NM_SETTING_GSM_PIN_FLAGS
 #define             NM_SETTING_GSM_HOME_ONLY
-#define             NM_SETTING_GSM_PUK
-#define             NM_SETTING_GSM_BAND
-#define             NM_GSM_NETWORK_ANY
-#define             NM_GSM_NETWORK_UMTS_HSPA
-#define             NM_GSM_NETWORK_GPRS_EDGE
-#define             NM_GSM_NETWORK_PREFER_UMTS_HSPA
-#define             NM_GSM_NETWORK_PREFER_GPRS_EDGE
 enum                NMSettingGsmNetworkType;
 enum                NMSettingGsmNetworkBand;
                     NMSettingGsm;
@@ -77,42 +72,46 @@ const char *        guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
 gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_puk              (NMSettingGsm *setting);
-int                 nm_setting_gsm_get_band             (NMSettingGsm *setting);
+NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);
+NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingGsmError
+

 
   GObject
    +----NMSetting
          +----NMSettingGsm
 

 

-

+

 
Properties

 
   "allowed-bands"            guint                 : Read / Write / Construct
   "apn"                      gchar*                : Read / Write
-  "band"                     gint                  : Read / Write / Construct
   "home-only"                gboolean              : Read / Write
   "network-id"               gchar*                : Read / Write
   "network-type"             gint                  : Read / Write / Construct
   "number"                   gchar*                : Read / Write
   "password"                 gchar*                : Read / Write
+  "password-flags"           guint                 : Read / Write
   "pin"                      gchar*                : Read / Write
-  "puk"                      gchar*                : Read / Write
+  "pin-flags"                guint                 : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_GSM_SETTING_NAME

 
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

@@ -120,7 +119,7 @@ const char *        
+

 
enum NMSettingGsmError

 
typedef enum
 {
@@ -134,7 +133,7 @@ const char *        
+

 
NM_TYPE_SETTING_GSM_ERROR

 
#define NM_TYPE_SETTING_GSM_ERROR (nm_setting_gsm_error_get_type ()) 
 

@@ -142,7 +141,7 @@ const char *        
+

 
NM_SETTING_GSM_ERROR

 
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 

@@ -150,150 +149,102 @@ const char *        
+

 
nm_setting_gsm_error_quark ()

 
GQuark              nm_setting_gsm_error_quark          (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER        "number"
+
#define NM_SETTING_GSM_NUMBER         "number"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_USERNAME

-
#define NM_SETTING_GSM_USERNAME      "username"
+
#define NM_SETTING_GSM_USERNAME       "username"
 

 

 

 

 

-

+

 
NM_SETTING_GSM_PASSWORD

-
#define NM_SETTING_GSM_PASSWORD      "password"
-

-

-

-

-

-

-
NM_SETTING_GSM_APN

-
#define NM_SETTING_GSM_APN           "apn"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_ID

-
#define NM_SETTING_GSM_NETWORK_ID    "network-id"
+
#define NM_SETTING_GSM_PASSWORD       "password"
 

 

 

 

 

-

-
NM_SETTING_GSM_NETWORK_TYPE

-
#define NM_SETTING_GSM_NETWORK_TYPE  "network-type"
+

+
NM_SETTING_GSM_PASSWORD_FLAGS

+
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

-

-
NM_SETTING_GSM_ALLOWED_BANDS

-
#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN

-
#define NM_SETTING_GSM_PIN           "pin"
-

-

-

-

-

-

-
NM_SETTING_GSM_HOME_ONLY

-
#define NM_SETTING_GSM_HOME_ONLY     "home-only"
-

-

-

-

-

-

-
NM_SETTING_GSM_PUK

-
#define NM_SETTING_GSM_PUK           "puk"
+

+
NM_SETTING_GSM_APN

+
#define NM_SETTING_GSM_APN            "apn"
 

 

 

 

 

-

-
NM_SETTING_GSM_BAND

-
#define NM_SETTING_GSM_BAND          "band"
+

+
NM_SETTING_GSM_NETWORK_ID

+
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 

 

 

 

 

-

-
NM_GSM_NETWORK_ANY

-
#define NM_GSM_NETWORK_ANY              NM_SETTING_GSM_NETWORK_TYPE_ANY
+

+
NM_SETTING_GSM_NETWORK_TYPE

+
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
 

 

 

 

 

-

-
NM_GSM_NETWORK_UMTS_HSPA

-
#define NM_GSM_NETWORK_UMTS_HSPA        NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
+

+
NM_SETTING_GSM_ALLOWED_BANDS

+
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 

 

 

 

 

-

-
NM_GSM_NETWORK_GPRS_EDGE

-
#define NM_GSM_NETWORK_GPRS_EDGE        NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
+

+
NM_SETTING_GSM_PIN

+
#define NM_SETTING_GSM_PIN            "pin"
 

 

 

 

 

-

-
NM_GSM_NETWORK_PREFER_UMTS_HSPA

-
#define NM_GSM_NETWORK_PREFER_UMTS_HSPA NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
+

+
NM_SETTING_GSM_PIN_FLAGS

+
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 

 

 

 

 

-

-
NM_GSM_NETWORK_PREFER_GPRS_EDGE

-
#define NM_GSM_NETWORK_PREFER_GPRS_EDGE NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
+

+
NM_SETTING_GSM_HOME_ONLY

+
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 

 

 

 

 

-

+

 
enum NMSettingGsmNetworkType

 
typedef enum {
 	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
@@ -307,7 +258,7 @@ const char *        
+

 
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -330,14 +281,14 @@ const char *        
+

 
NMSettingGsm

 
typedef struct _NMSettingGsm NMSettingGsm;

 

 

 

 

-

+

 
NMSettingGsmClass

 
typedef struct {
 	NMSettingClass parent;
@@ -353,281 +304,126 @@ const char *        
+

 
nm_setting_gsm_get_type ()

 
GType               nm_setting_gsm_get_type             (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_gsm_new ()

 
NMSetting *         nm_setting_gsm_new                  (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_gsm_get_number ()

 
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_username ()

 
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_password ()

 
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_apn ()

 
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_network_id ()

 
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_network_type ()

 
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_allowed_bands ()

 
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_pin ()

 
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_gsm_get_home_only ()

 
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

-
nm_setting_gsm_get_puk ()

-
const char *        nm_setting_gsm_get_puk              (NMSettingGsm *setting);

-

-

+

+
nm_setting_gsm_get_pin_flags ()

+
NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);

 

-
-

 
 
 

 
setting :

+the NMSettingGsm
 
 

 

 
Returns :

+the NMSettingSecretFlags pertaining to the "pin"
 
 

 
 

 

 

-

-
nm_setting_gsm_get_band ()

-
int                 nm_setting_gsm_get_band             (NMSettingGsm *setting);

-

-

+

+
nm_setting_gsm_get_password_flags ()

+
NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);

 

-
-

 
 
 

 
setting :

+the NMSettingGsm
 
 

 

 
Returns :

+the NMSettingSecretFlags pertaining to the "password"
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "allowed-bands" property

 
  "allowed-bands"            guint                 : Read / Write / Construct

 

@@ -638,7 +434,7 @@ frequency band control.
 
Default value: 1

 

 

-

+

 
The "apn" property

 
  "apn"                      gchar*                : Read / Write

 

@@ -653,17 +449,7 @@ GSM 03.60 Section 14.9.
 
Default value: NULL

 

 

-

-
The "band" property

-
  "band"                     gint                  : Read / Write / Construct

-

-DEPRECATED
-

-
Allowed values: [-1,5]

-
Default value: -1

-

-

-

+

 
The "home-only" property

 
  "home-only"                gboolean              : Read / Write

 

@@ -673,7 +459,7 @@ Connections to roaming networks will not be made.
 
Default value: FALSE

 

 

-

+

 
The "network-id" property

 
  "network-id"               gchar*                : Read / Write

 

@@ -686,7 +472,7 @@ roaming control of the device is not otherwise possible.
 
Default value: NULL

 

 

-

+

 
The "network-type" property

 
  "network-type"             gint                  : Read / Write / Construct

 

@@ -695,11 +481,11 @@ technologies.  The permitted values are: -1: any, 0: 3G only,
 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all
 devices allow network preference control.
 

-
Allowed values: [-1,3]

+
Allowed values: [G_MAXULONG,3]

 
Default value: -1

 

 

-

+

 
The "number" property

 
  "number"                   gchar*                : Read / Write

 

@@ -711,7 +497,7 @@ automatically when required.
 
Default value: NULL

 

 

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -722,7 +508,17 @@ password is required, it is specified here.
 
Default value: NULL

 

 

-

+

+
The "password-flags" property

+
  "password-flags"           guint                 : Read / Write

+

+Flags indicating how to handle "password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "pin" property

 
  "pin"                      gchar*                : Read / Write

 

@@ -733,16 +529,17 @@ the device.
 
Default value: NULL

 

 

-

-
The "puk" property

-
  "puk"                      gchar*                : Read / Write

+

+
The "pin-flags" property

+
  "pin-flags"                guint                 : Read / Write

 

-DEPRECATED
+Flags indicating how to handle "pin":.
 

-
Default value: NULL

+
Allowed values: <= 7

+
Default value: 0

 

 

-

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -756,6 +553,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index d4b1422f..6a701adf 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
-enum                NMSettingIP4ConfigError;
+
#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
+enum                NMSettingIP4ConfigError;
 #define             NM_TYPE_SETTING_IP4_CONFIG_ERROR
 #define             NM_SETTING_IP4_CONFIG_ERROR
 GQuark              nm_setting_ip4_config_error_quark   (void);
@@ -63,40 +63,42 @@ enum                NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
 #define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-typedef             NMIP4Address;
-NMIP4Address *      nm_ip4_address_new                  (void);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
-void                nm_ip4_address_unref                (NMIP4Address *address);
-gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);
-guint32             nm_ip4_address_get_address          (NMIP4Address *address);
-void                nm_ip4_address_set_address          (NMIP4Address *address,
+typedef             NMIP4Address;
+GType               nm_ip4_address_get_type             (void);
+NMIP4Address *      nm_ip4_address_new                  (void);
+NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
+void                nm_ip4_address_ref                  (NMIP4Address *address);
+void                nm_ip4_address_unref                (NMIP4Address *address);
+gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);
+guint32             nm_ip4_address_get_address          (NMIP4Address *address);
+void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
+void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
-void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
+void                nm_ip4_address_set_gateway          (NMIP4Address *address,
                                                          guint32 gateway);
-typedef             NMIP4Route;
-NMIP4Route *        nm_ip4_route_new                    (void);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
-gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);
-guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
-void                nm_ip4_route_set_dest               (NMIP4Route *route,
+typedef             NMIP4Route;
+GType               nm_ip4_route_get_type               (void);
+NMIP4Route *        nm_ip4_route_new                    (void);
+NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);
+void                nm_ip4_route_ref                    (NMIP4Route *route);
+void                nm_ip4_route_unref                  (NMIP4Route *route);
+gboolean            nm_ip4_route_compare                (NMIP4Route *route,
+                                                         NMIP4Route *other);
+guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
+void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
+void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
+void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
                                                          guint32 next_hop);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
-void                nm_ip4_route_set_metric             (NMIP4Route *route,
+guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
+void                nm_ip4_route_set_metric             (NMIP4Route *route,
                                                          guint32 metric);
                     NMSettingIP4Config;
                     NMSettingIP4ConfigClass;
@@ -126,10 +128,10 @@ const char *        NMSettingIP4Config *setting);
 guint32             nm_setting_ip4_config_get_num_addresses
                                                         (NMSettingIP4Config *setting);
-NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
+                                                         NMIP4Address *address);
 void                nm_setting_ip4_config_remove_address
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);
@@ -137,10 +139,10 @@ const char *        NMSettingIP4Config *setting);
 guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
+                                                         NMIP4Route *route);
 void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);
 void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
@@ -159,15 +161,27 @@ const char *        gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP4ConfigError
+

+
+  GBoxed
+   +----NMIP4Address
+

+
+  GBoxed
+   +----NMIP4Route
+

 
   GObject
    +----NMSetting
          +----NMSettingIP4Config
 

 

-

+

 
Properties

 
   "addresses"                GPtrArray_GArray_guint__*  : Read / Write
@@ -184,14 +198,14 @@ const char *        routes"                   GPtrArray_GArray_guint__*  : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_IP4_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

@@ -199,7 +213,7 @@ const char *        
+

 
enum NMSettingIP4ConfigError

 
typedef enum
 {
@@ -213,7 +227,7 @@ const char *        
+

 
NM_TYPE_SETTING_IP4_CONFIG_ERROR

 
#define NM_TYPE_SETTING_IP4_CONFIG_ERROR (nm_setting_ip4_config_error_get_type ()) 
 

@@ -221,7 +235,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ERROR

 
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 

@@ -229,22 +243,14 @@ const char *        
+

 
nm_setting_ip4_config_error_quark ()

 
GQuark              nm_setting_ip4_config_error_quark   (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_IP4_CONFIG_METHOD

 
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

@@ -252,7 +258,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DNS

 
#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 

@@ -260,7 +266,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 

@@ -268,7 +274,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ADDRESSES

 
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

@@ -276,7 +282,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_ROUTES

 
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

@@ -284,7 +290,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

@@ -292,7 +298,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -300,7 +306,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

 
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

@@ -308,7 +314,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

@@ -316,7 +322,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

@@ -324,7 +330,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

@@ -332,7 +338,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

@@ -340,7 +346,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_AUTO

 
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 

@@ -348,7 +354,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -356,7 +362,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

 
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
 

@@ -364,7 +370,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 

@@ -372,7 +378,7 @@ const char *        
+

 
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

 
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 

@@ -380,7 +386,7 @@ const char *        
+

 
NMIP4Address

 
typedef struct NMIP4Address NMIP4Address;
 

@@ -388,237 +394,95 @@ const char *        
+

+
nm_ip4_address_get_type ()

+
GType               nm_ip4_address_get_type             (void);

+

+

+

+

+

 
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

+
NMIP4Address *      nm_ip4_address_new                  (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_ip4_address_dup ()

-
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

+
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


source :

-
Returns :

-

 

 

-

+

 
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

+
void                nm_ip4_address_ref                  (NMIP4Address *address);

 

 

-

--
-
-
-
-


address :

-

 

 

-

+

 
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

+
void                nm_ip4_address_unref                (NMIP4Address *address);

 

 

-

--
-
-
-
-


address :

-

 

 

-

+

 
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

+
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


address :

-
other :

-
Returns :

-

 

 

-

+

 
nm_ip4_address_get_address ()

-
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

+
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip4_address_set_address ()

-
void                nm_ip4_address_set_address          (NMIP4Address *address,
+
void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
addr :

-

 

 

-

+

 
nm_ip4_address_get_prefix ()

-
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

+
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip4_address_set_prefix ()

-
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
prefix :

-

 

 

-

+

 
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

+
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip4_address_set_gateway ()

-
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
                                                          guint32 gateway);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
gateway :

-

 

 

-

+

 
NMIP4Route

 
typedef struct NMIP4Route NMIP4Route;
 

@@ -626,289 +490,117 @@ const char *        
+

+
nm_ip4_route_get_type ()

+
GType               nm_ip4_route_get_type               (void);

+

+

+

+

+

 
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

+
NMIP4Route *        nm_ip4_route_new                    (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_ip4_route_dup ()

-
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);

+
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

+
void                nm_ip4_route_ref                    (NMIP4Route *route);

 

 

-

--
-
-
-
-


route :

-

 

 

-

+

 
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

+
void                nm_ip4_route_unref                  (NMIP4Route *route);

 

 

-

--
-
-
-
-


route :

-

 

 

-

+

 
nm_ip4_route_compare ()

-
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);

+
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
+                                                         NMIP4Route *other);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


route :

-
other :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

+
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
+
void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
dest :

-

 

 

-

+

 
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

+
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
prefix :

-

 

 

-

+

 
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

+
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_set_next_hop ()

-
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
                                                          guint32 next_hop);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
next_hop :

-

 

 

-

+

 
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

+
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip4_route_set_metric ()

-
void                nm_ip4_route_set_metric             (NMIP4Route *route,
+
void                nm_ip4_route_set_metric             (NMIP4Route *route,
                                                          guint32 metric);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
metric :

-

 

 

-

+

 
NMSettingIP4Config

 
typedef struct _NMSettingIP4Config NMSettingIP4Config;

 

 

 

 

-

+

 
NMSettingIP4ConfigClass

 
typedef struct {
 	NMSettingClass parent;
@@ -924,694 +616,246 @@ const char *        
+

 
nm_setting_ip4_config_get_type ()

 
GType               nm_setting_ip4_config_get_type      (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ip4_config_new ()

 
NMSetting *         nm_setting_ip4_config_new           (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_method ()

 
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_num_dns ()

 
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_dns ()

 
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_add_dns ()

 
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
                                                          guint32 dns);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
dns :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_remove_dns ()

 
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip4_config_clear_dns ()

 
void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip4_config_get_num_dns_searches ()

 
guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_dns_search ()

 
const char *        nm_setting_ip4_config_get_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_add_dns_search ()

 
gboolean            nm_setting_ip4_config_add_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          const char *dns_search);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
dns_search :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_remove_dns_search ()

 
void                nm_setting_ip4_config_remove_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip4_config_clear_dns_searches ()

 
void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip4_config_get_num_addresses ()

 
guint32             nm_setting_ip4_config_get_num_addresses
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_add_address ()

 
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

+                                                         NMIP4Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
address :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_remove_address ()

 
void                nm_setting_ip4_config_remove_address
                                                         (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip4_config_clear_addresses ()

 
void                nm_setting_ip4_config_clear_addresses
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip4_config_get_num_routes ()

 
guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_add_route ()

 
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

+                                                         NMIP4Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
route :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_remove_route ()

 
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip4_config_clear_routes ()

 
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip4_config_get_ignore_auto_routes ()

 
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_ignore_auto_dns ()

 
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_client_id ()

 
const char *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_send_hostname ()

 
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_dhcp_hostname ()

 
const char *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_never_default ()

 
gboolean            nm_setting_ip4_config_get_never_default
                                                         (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip4_config_get_may_fail ()

 
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

 
  "addresses"                GPtrArray_GArray_guint__*  : Read / Write

 

@@ -1626,7 +870,7 @@ either automatic or disabled with these methods.
 

 

 

-

+

 
The "dhcp-client-id" property

 
  "dhcp-client-id"           gchar*                : Read / Write

 

@@ -1636,7 +880,7 @@ DHCP server may use to cusomize the DHCP lease and options.
 
Default value: NULL

 

 

-

+

 
The "dhcp-hostname" property

 
  "dhcp-hostname"            gchar*                : Read / Write

 

@@ -1646,7 +890,7 @@ specified name will be sent to the DHCP server when acquiring a lease.
 
Default value: NULL

 

 

-

+

 
The "dhcp-send-hostname" property

 
  "dhcp-send-hostname"       gboolean              : Read / Write / Construct

 

@@ -1659,7 +903,7 @@ the current persistent hostname of the computer is sent.
 
Default value: TRUE

 

 

-

+

 
The "dns" property

 
  "dns"                      GArray_guint_*        : Read / Write

 

@@ -1672,7 +916,7 @@ connection.
 

 

 

-

+

 
The "dns-search" property

 
  "dns-search"               GSList_gchararray_*   : Read / Write

 

@@ -1684,7 +928,7 @@ are used as the only search domains for this connection.
 

 

 

-

+

 
The "ignore-auto-dns" property

 
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

 

@@ -1696,7 +940,7 @@ and search domains specified in 
+

 
The "ignore-auto-routes" property

 
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

 

@@ -1707,7 +951,7 @@ configured routes are ignored and only routes specified in
 
Default value: FALSE

 

 

-

+

 
The "may-fail" property

 
  "may-fail"                 gboolean              : Read / Write / Construct

 

@@ -1721,7 +965,7 @@ but IPv6 configuration completes successfully.
 
Default value: FALSE

 

 

-

+

 
The "method" property

 
  "method"                   gchar*                : Read / Write

 

@@ -1741,7 +985,7 @@ This property must be set.
 
Default value: NULL

 

 

-

+

 
The "never-default" property

 
  "never-default"            gboolean              : Read / Write / Construct

 

@@ -1751,7 +995,7 @@ meaning it will never be assigned the default route by NetworkManager.
 
Default value: FALSE

 

 

-

+

 
The "routes" property

 
  "routes"                   GPtrArray_GArray_guint__*  : Read / Write

 

@@ -1769,6 +1013,6 @@ or 'disabled' methods because there is no upstream network.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 6946c47d..060c80fe 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
-enum                NMSettingIP6ConfigError;
+
#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
+enum                NMSettingIP6ConfigError;
 #define             NM_TYPE_SETTING_IP6_CONFIG_ERROR
 #define             NM_SETTING_IP6_CONFIG_ERROR
 GQuark              nm_setting_ip6_config_error_quark   (void);
@@ -61,46 +61,49 @@ enum                NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-typedef             NMIP6Address;
-NMIP6Address *      nm_ip6_address_new                  (void);
-NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
-void                nm_ip6_address_unref                (NMIP6Address *address);
-gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);
-const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
-void                nm_ip6_address_set_address          (NMIP6Address *address,
+typedef             NMIP6Address;
+GType               nm_ip6_address_get_type             (void);
+NMIP6Address *          nm_ip6_address_new              (void);
+NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);
+void                nm_ip6_address_ref                  (NMIP6Address *address);
+void                nm_ip6_address_unref                (NMIP6Address *address);
+gboolean            nm_ip6_address_compare              (NMIP6Address *address,
+                                                         NMIP6Address *other);
+const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
+void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
+void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
-void                nm_ip6_address_set_gateway          (NMIP6Address *address,
+const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
+void                nm_ip6_address_set_gateway          (NMIP6Address *address,
                                                          const struct in6_addr *gw);
-typedef             NMIP6Route;
-NMIP6Route *        nm_ip6_route_new                    (void);
-NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *route);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
-gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);
-const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
-void                nm_ip6_route_set_dest               (NMIP6Route *route,
+typedef             NMIP6Route;
+GType               nm_ip6_route_get_type               (void);
+NMIP6Route *            nm_ip6_route_new                (void);
+NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *route);
+void                nm_ip6_route_ref                    (NMIP6Route *route);
+void                nm_ip6_route_unref                  (NMIP6Route *route);
+gboolean            nm_ip6_route_compare                (NMIP6Route *route,
+                                                         NMIP6Route *other);
+const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
+void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
+void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
+void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
                                                          const struct in6_addr *next_hop);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
-void                nm_ip6_route_set_metric             (NMIP6Route *route,
+guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
+void                nm_ip6_route_set_metric             (NMIP6Route *route,
                                                          guint32 metric);
                     NMSettingIP6Config;
                     NMSettingIP6ConfigClass;
 GType               nm_setting_ip6_config_get_type      (void);
-NMSetting *         nm_setting_ip6_config_new           (void);
-const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
+NMSetting *             nm_setting_ip6_config_new       (void);
+const char *            nm_setting_ip6_config_get_method
+                                                        (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
 const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);
@@ -111,7 +114,7 @@ const struct in6_addr * void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);
-const char *        nm_setting_ip6_config_get_dns_search
+const char *            nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_dns_search
@@ -124,10 +127,11 @@ const char *        NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);
-NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
+NMIP6Address *          nm_setting_ip6_config_get_address
+                                                        (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
+                                                         NMIP6Address *address);
 void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
@@ -135,10 +139,10 @@ const char *        NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);
-NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
+NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
                                                          guint32 i);
 gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
+                                                         NMIP6Route *route);
 void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);
 void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
@@ -151,15 +155,27 @@ const char *        gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP6ConfigError
+

+
+  GBoxed
+   +----NMIP6Address
+

+
+  GBoxed
+   +----NMIP6Route
+

 
   GObject
    +----NMSetting
          +----NMSettingIP6Config
 

 

-

+

 
Properties

 
   "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write
@@ -173,14 +189,14 @@ const char *        routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_IP6_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

@@ -188,7 +204,7 @@ const char *        
+

 
enum NMSettingIP6ConfigError

 
typedef enum
 {
@@ -202,7 +218,7 @@ const char *        
+

 
NM_TYPE_SETTING_IP6_CONFIG_ERROR

 
#define NM_TYPE_SETTING_IP6_CONFIG_ERROR (nm_setting_ip6_config_error_get_type ()) 
 

@@ -210,7 +226,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_ERROR

 
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 

@@ -218,22 +234,14 @@ const char *        
+

 
nm_setting_ip6_config_error_quark ()

 
GQuark              nm_setting_ip6_config_error_quark   (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_IP6_CONFIG_METHOD

 
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

@@ -241,7 +249,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_DNS

 
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 

@@ -249,7 +257,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 

@@ -257,7 +265,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_ADDRESSES

 
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

@@ -265,7 +273,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_ROUTES

 
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 

@@ -273,7 +281,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

@@ -281,7 +289,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -289,7 +297,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

@@ -297,7 +305,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 

@@ -305,7 +313,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

 
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 

@@ -313,7 +321,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_AUTO

 
#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
 

@@ -321,7 +329,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_DHCP

 
#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
 

@@ -329,7 +337,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -337,7 +345,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_MANUAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
 

@@ -345,7 +353,7 @@ const char *        
+

 
NM_SETTING_IP6_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
 

@@ -353,7 +361,7 @@ const char *        
+

 
NMIP6Address

 
typedef struct NMIP6Address NMIP6Address;
 

@@ -361,237 +369,95 @@ const char *        
+

+
nm_ip6_address_get_type ()

+
GType               nm_ip6_address_get_type             (void);

+

+

+

+

+

 
nm_ip6_address_new ()

-
NMIP6Address *      nm_ip6_address_new                  (void);

+
NMIP6Address *          nm_ip6_address_new              (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_ip6_address_dup ()

-
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

+
NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


source :

-
Returns :

-

 

 

-

+

 
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

+
void                nm_ip6_address_ref                  (NMIP6Address *address);

 

 

-

--
-
-
-
-


address :

-

 

 

-

+

 
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

+
void                nm_ip6_address_unref                (NMIP6Address *address);

 

 

-

--
-
-
-
-


address :

-

 

 

-

+

 
nm_ip6_address_compare ()

-
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);

+
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
+                                                         NMIP6Address *other);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


address :

-
other :

-
Returns :

-

 

 

-

+

 
nm_ip6_address_get_address ()

-
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

+
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
+
void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
addr :

-

 

 

-

+

 
nm_ip6_address_get_prefix ()

-
guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);

+
guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
prefix :

-

 

 

-

+

 
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

+
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
Returns :

-

 

 

-

+

 
nm_ip6_address_set_gateway ()

-
void                nm_ip6_address_set_gateway          (NMIP6Address *address,
+
void                nm_ip6_address_set_gateway          (NMIP6Address *address,
                                                          const struct in6_addr *gw);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


address :

-
gw :

-

 

 

-

+

 
NMIP6Route

 
typedef struct NMIP6Route NMIP6Route;
 

@@ -599,289 +465,117 @@ const char *        
+

+
nm_ip6_route_get_type ()

+
GType               nm_ip6_route_get_type               (void);

+

+

+

+

+

 
nm_ip6_route_new ()

-
NMIP6Route *        nm_ip6_route_new                    (void);

+
NMIP6Route *            nm_ip6_route_new                (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_ip6_route_dup ()

-
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *route);

+
NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

+
void                nm_ip6_route_ref                    (NMIP6Route *route);

 

 

-

--
-
-
-
-


route :

-

 

 

-

+

 
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

+
void                nm_ip6_route_unref                  (NMIP6Route *route);

 

 

-

--
-
-
-
-


route :

-

 

 

-

+

 
nm_ip6_route_compare ()

-
gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);

+
gboolean            nm_ip6_route_compare                (NMIP6Route *route,
+                                                         NMIP6Route *other);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


route :

-
other :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

+
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
+
void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
dest :

-

 

 

-

+

 
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

+
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
prefix :

-

 

 

-

+

 
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

+
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
                                                          const struct in6_addr *next_hop);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
next_hop :

-

 

 

-

+

 
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

+
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
Returns :

-

 

 

-

+

 
nm_ip6_route_set_metric ()

-
void                nm_ip6_route_set_metric             (NMIP6Route *route,
+
void                nm_ip6_route_set_metric             (NMIP6Route *route,
                                                          guint32 metric);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


route :

-
metric :

-

 

 

-

+

 
NMSettingIP6Config

 
typedef struct _NMSettingIP6Config NMSettingIP6Config;

 

 

 

 

-

+

 
NMSettingIP6ConfigClass

 
typedef struct {
 	NMSettingClass parent;
@@ -897,625 +591,224 @@ const char *        
+

 
nm_setting_ip6_config_get_type ()

 
GType               nm_setting_ip6_config_get_type      (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ip6_config_new ()

-
NMSetting *         nm_setting_ip6_config_new           (void);

+
NMSetting *             nm_setting_ip6_config_new       (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_method ()

-
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

+
const char *            nm_setting_ip6_config_get_method
+                                                        (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_num_dns ()

 
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_dns ()

 
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_add_dns ()

 
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
                                                          const struct in6_addr *dns);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
dns :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_remove_dns ()

 
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip6_config_clear_dns ()

 
void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip6_config_get_num_dns_searches ()

 
guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_dns_search ()

-
const char *        nm_setting_ip6_config_get_dns_search
+
const char *            nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_add_dns_search ()

 
gboolean            nm_setting_ip6_config_add_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          const char *dns_search);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
dns_search :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_remove_dns_search ()

 
void                nm_setting_ip6_config_remove_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip6_config_clear_dns_searches ()

 
void                nm_setting_ip6_config_clear_dns_searches
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip6_config_get_num_addresses ()

 
guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_address ()

-
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
+
NMIP6Address *          nm_setting_ip6_config_get_address
+                                                        (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_add_address ()

 
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

+                                                         NMIP6Address *address);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
address :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_remove_address ()

 
void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip6_config_clear_addresses ()

 
void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip6_config_get_num_routes ()

 
guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_route ()

-
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
+
NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_add_route ()

 
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

+                                                         NMIP6Route *route);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
route :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_remove_route ()

 
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_ip6_config_clear_routes ()

 
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_ip6_config_get_ignore_auto_routes ()

 
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_ignore_auto_dns ()

 
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_never_default ()

 
gboolean            nm_setting_ip6_config_get_never_default
                                                         (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ip6_config_get_may_fail ()

 
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "addresses" property

 
  "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write

 

@@ -1532,7 +825,7 @@ assigned an address with these methods.
 

 

 

-

+

 
The "dns" property

 
  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write

 

@@ -1546,7 +839,7 @@ this connection.
 

 

 

-

+

 
The "dns-search" property

 
  "dns-search"               GSList_gchararray_*   : Read / Write

 

@@ -1558,7 +851,7 @@ as the only search domains for this connection.
 

 

 

-

+

 
The "ignore-auto-dns" property

 
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

 

@@ -1571,7 +864,7 @@ used.
 
Default value: FALSE

 

 

-

+

 
The "ignore-auto-routes" property

 
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

 

@@ -1582,7 +875,7 @@ specified in 
+

 
The "may-fail" property

 
  "may-fail"                 gboolean              : Read / Write / Construct

 

@@ -1596,7 +889,7 @@ but IPv4 configuration completes successfully.
 
Default value: FALSE

 

 

-

+

 
The "method" property

 
  "method"                   gchar*                : Read / Write

 

@@ -1614,7 +907,7 @@ method are not yet supported.
 
Default value: NULL

 

 

-

+

 
The "never-default" property

 
  "never-default"            gboolean              : Read / Write / Construct

 

@@ -1624,7 +917,7 @@ meaning it will never be assigned the default IPv6 route by NetworkManager.
 
Default value: FALSE

 

 

-

+

 
The "routes" property

 
  "routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write

 

@@ -1642,6 +935,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index d77036ac..43ea8d27 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-enum                NMSettingOlpcMeshError;
+
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
+enum                NMSettingOlpcMeshError;
 #define             NM_TYPE_SETTING_OLPC_MESH_ERROR
 #define             NM_SETTING_OLPC_MESH_ERROR
 GQuark              nm_setting_olpc_mesh_error_quark    (void);
@@ -59,15 +59,19 @@ const NMSettingOlpcMesh *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingOlpcMeshError
+

 
   GObject
    +----NMSetting
          +----NMSettingOlpcMesh
 

 

-

+

 
Properties

 
   "channel"                  guint                 : Read / Write / Construct
@@ -75,14 +79,14 @@ const ssid"                     GArray_guchar_*       : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_OLPC_MESH_SETTING_NAME

 
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

@@ -90,7 +94,7 @@ const 
+

 
enum NMSettingOlpcMeshError

 
typedef enum
 {
@@ -103,7 +107,7 @@ const 
+

 
NM_TYPE_SETTING_OLPC_MESH_ERROR

 
#define NM_TYPE_SETTING_OLPC_MESH_ERROR (nm_setting_olpc_mesh_error_get_type ()) 
 

@@ -111,7 +115,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_ERROR

 
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 

@@ -119,22 +123,14 @@ const 
+

 
nm_setting_olpc_mesh_error_quark ()

 
GQuark              nm_setting_olpc_mesh_error_quark    (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_OLPC_MESH_SSID

 
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

@@ -142,7 +138,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_CHANNEL

 
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

@@ -150,7 +146,7 @@ const 
+

 
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

 
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

@@ -158,14 +154,14 @@ const 
+

 
NMSettingOlpcMesh

 
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

 

 

 

 

-

+

 
NMSettingOlpcMeshClass

 
typedef struct {
 	NMSettingClass parent;
@@ -181,22 +177,14 @@ const 
+

 
nm_setting_olpc_mesh_get_type ()

 
GType               nm_setting_olpc_mesh_get_type       (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_olpc_mesh_new ()

 
NMSetting *         nm_setting_olpc_mesh_new            (void);

 

@@ -206,82 +194,36 @@ Creates a new 
 
 
Returns :

- the new empty NMSettingOlpcMesh object
-
+the new empty NMSettingOlpcMesh object
 
 

 

 

-

+

 
nm_setting_olpc_mesh_get_ssid ()

 
const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_olpc_mesh_get_channel ()

 
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

 
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (NMSettingOlpcMesh *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "channel" property

 
  "channel"                  guint                 : Read / Write / Construct

 

@@ -290,7 +232,7 @@ Channel on which the mesh network to join is located.
 
Default value: 0

 

 

-

+

 
The "dhcp-anycast-address" property

 
  "dhcp-anycast-address"     GArray_guchar_*       : Read / Write

 

@@ -300,7 +242,7 @@ the request.
 

 

 

-

+

 
The "ssid" property

 
  "ssid"                     GArray_guchar_*       : Read / Write

 

@@ -311,6 +253,6 @@ SSID of the mesh network to join.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 6488a3f0..eade54a5 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_PPP_SETTING_NAME
-enum                NMSettingPPPError;
+
#define             NM_SETTING_PPP_SETTING_NAME
+enum                NMSettingPPPError;
 #define             NM_TYPE_SETTING_PPP_ERROR
 #define             NM_SETTING_PPP_ERROR
 GQuark              nm_setting_ppp_error_quark          (void);
@@ -89,15 +89,19 @@ enum                NMSettingPPP *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPP
 

 

-

+

 
Properties

 
   "baud"                     guint                 : Read / Write / Construct
@@ -120,14 +124,14 @@ enum                require-mppe-128"         gboolean              : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_PPP_SETTING_NAME

 
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

@@ -135,7 +139,7 @@ enum                
 

 

-

+

 
enum NMSettingPPPError

 
typedef enum
 {
@@ -149,7 +153,7 @@ enum                
 

 

-

+

 
NM_TYPE_SETTING_PPP_ERROR

 
#define NM_TYPE_SETTING_PPP_ERROR (nm_setting_ppp_error_get_type ()) 
 

@@ -157,7 +161,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_ERROR

 
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 

@@ -165,22 +169,14 @@ enum                
 

 

-

+

 
nm_setting_ppp_error_quark ()

 
GQuark              nm_setting_ppp_error_quark          (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_PPP_NOAUTH

 
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

@@ -188,7 +184,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REFUSE_EAP

 
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

@@ -196,7 +192,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REFUSE_PAP

 
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

@@ -204,7 +200,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REFUSE_CHAP

 
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

@@ -212,7 +208,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REFUSE_MSCHAP

 
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

@@ -220,7 +216,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REFUSE_MSCHAPV2

 
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

@@ -228,7 +224,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_NOBSDCOMP

 
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

@@ -236,7 +232,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_NODEFLATE

 
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

@@ -244,7 +240,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_NO_VJ_COMP

 
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

@@ -252,7 +248,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REQUIRE_MPPE

 
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

@@ -260,7 +256,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_REQUIRE_MPPE_128

 
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

@@ -268,7 +264,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_MPPE_STATEFUL

 
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

@@ -276,7 +272,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_CRTSCTS

 
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

@@ -284,7 +280,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_BAUD

 
#define NM_SETTING_PPP_BAUD              "baud"
 

@@ -292,7 +288,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_MRU

 
#define NM_SETTING_PPP_MRU               "mru"
 

@@ -300,7 +296,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_MTU

 
#define NM_SETTING_PPP_MTU               "mtu"
 

@@ -308,7 +304,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_LCP_ECHO_FAILURE

 
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

@@ -316,7 +312,7 @@ enum                
 

 

-

+

 
NM_SETTING_PPP_LCP_ECHO_INTERVAL

 
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

@@ -324,14 +320,14 @@ enum                
 

 

-

+

 
NMSettingPPP

 
typedef struct _NMSettingPPP NMSettingPPP;

 

 

 

 

-

+

 
NMSettingPPPClass

 
typedef struct {
 	NMSettingClass parent;
@@ -347,436 +343,150 @@ enum                
 

 

-

+

 
nm_setting_ppp_get_type ()

 
GType               nm_setting_ppp_get_type             (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ppp_new ()

 
NMSetting *         nm_setting_ppp_new                  (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_ppp_get_noauth ()

 
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_refuse_eap ()

 
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_refuse_pap ()

 
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_refuse_chap ()

 
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_refuse_mschap ()

 
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_refuse_mschapv2 ()

 
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_nobsdcomp ()

 
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_nodeflate ()

 
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_no_vj_comp ()

 
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_require_mppe ()

 
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_require_mppe_128 ()

 
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_mppe_stateful ()

 
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_crtscts ()

 
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_baud ()

 
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_mru ()

 
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_mtu ()

 
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_lcp_echo_failure ()

 
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_ppp_get_lcp_echo_interval ()

 
guint32             nm_setting_ppp_get_lcp_echo_interval
                                                         (NMSettingPPP *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "baud" property

 
  "baud"                     guint                 : Read / Write / Construct

 

@@ -787,7 +497,7 @@ choose the speed.
 
Default value: 0

 

 

-

+

 
The "crtscts" property

 
  "crtscts"                  gboolean              : Read / Write / Construct

 

@@ -798,7 +508,7 @@ set to FALSE.
 
Default value: FALSE

 

 

-

+

 
The "lcp-echo-failure" property

 
  "lcp-echo-failure"         guint                 : Read / Write / Construct

 

@@ -810,7 +520,7 @@ value if this property is used.
 
Default value: 0

 

 

-

+

 
The "lcp-echo-interval" property

 
  "lcp-echo-interval"        guint                 : Read / Write / Construct

 

@@ -822,7 +532,7 @@ possible to autodetect this.
 
Default value: 0

 

 

-

+

 
The "mppe-stateful" property

 
  "mppe-stateful"            gboolean              : Read / Write / Construct

 

@@ -832,7 +542,7 @@ information on stateful MPPE.",
 
Default value: FALSE

 

 

-

+

 
The "mru" property

 
  "mru"                      guint                 : Read / Write / Construct

 

@@ -844,7 +554,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 
Default value: 0

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -854,7 +564,7 @@ size.
 
Default value: 0

 

 

-

+

 
The "no-vj-comp" property

 
  "no-vj-comp"               gboolean              : Read / Write / Construct

 

@@ -863,7 +573,7 @@ If TRUE, Van Jacobsen TCP header compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "noauth" property

 
  "noauth"                   gboolean              : Read / Write / Construct

 

@@ -874,7 +584,7 @@ the remote side.  In almost all cases, this should be TRUE.
 
Default value: TRUE

 

 

-

+

 
The "nobsdcomp" property

 
  "nobsdcomp"                gboolean              : Read / Write / Construct

 

@@ -883,7 +593,7 @@ If TRUE, BSD compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "nodeflate" property

 
  "nodeflate"                gboolean              : Read / Write / Construct

 

@@ -892,7 +602,7 @@ If TRUE, 'deflate' compression will not be requested.
 
Default value: FALSE

 

 

-

+

 
The "refuse-chap" property

 
  "refuse-chap"              gboolean              : Read / Write / Construct

 

@@ -901,7 +611,7 @@ If TRUE, the CHAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-eap" property

 
  "refuse-eap"               gboolean              : Read / Write / Construct

 

@@ -910,7 +620,7 @@ If TRUE, the EAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-mschap" property

 
  "refuse-mschap"            gboolean              : Read / Write / Construct

 

@@ -919,7 +629,7 @@ If TRUE, the MSCHAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-mschapv2" property

 
  "refuse-mschapv2"          gboolean              : Read / Write / Construct

 

@@ -928,7 +638,7 @@ If TRUE, the MSCHAPv2 authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "refuse-pap" property

 
  "refuse-pap"               gboolean              : Read / Write / Construct

 

@@ -937,7 +647,7 @@ If TRUE, the PAP authentication method will not be used.
 
Default value: FALSE

 

 

-

+

 
The "require-mppe" property

 
  "require-mppe"             gboolean              : Read / Write / Construct

 

@@ -949,7 +659,7 @@ connections.
 
Default value: FALSE

 

 

-

+

 
The "require-mppe-128" property

 
  "require-mppe-128"         gboolean              : Read / Write / Construct

 

@@ -963,6 +673,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 46c551bb..87669254 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,16 +39,17 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_PPPOE_SETTING_NAME
-enum                NMSettingPPPOEError;
+
#define             NM_SETTING_PPPOE_SETTING_NAME
+enum                NMSettingPPPOEError;
 #define             NM_TYPE_SETTING_PPPOE_ERROR
 #define             NM_SETTING_PPPOE_ERROR
 GQuark              nm_setting_pppoe_error_quark        (void);
 #define             NM_SETTING_PPPOE_SERVICE
 #define             NM_SETTING_PPPOE_USERNAME
 #define             NM_SETTING_PPPOE_PASSWORD
+#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
                     NMSettingPPPOE;
                     NMSettingPPPOEClass;
 GType               nm_setting_pppoe_get_type           (void);
@@ -56,32 +57,39 @@ enum                char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
+NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
+                                                        (NMSettingPPPOE *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPOEError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPPOE
 

 

-

+

 
Properties

 
   "password"                 gchar*                : Read / Write
+  "password-flags"           guint                 : Read / Write
   "service"                  gchar*                : Read / Write
   "username"                 gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_PPPOE_SETTING_NAME

 
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

@@ -89,7 +97,7 @@ const char *        
+

 
enum NMSettingPPPOEError

 
typedef enum
 {
@@ -103,7 +111,7 @@ const char *        
+

 
NM_TYPE_SETTING_PPPOE_ERROR

 
#define NM_TYPE_SETTING_PPPOE_ERROR (nm_setting_pppoe_error_get_type ()) 
 

@@ -111,7 +119,7 @@ const char *        
+

 
NM_SETTING_PPPOE_ERROR

 
#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 

@@ -119,53 +127,53 @@ const char *        
+

 
nm_setting_pppoe_error_quark ()

 
GQuark              nm_setting_pppoe_error_quark        (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_PPPOE_SERVICE

-
#define NM_SETTING_PPPOE_SERVICE  "service"
+
#define NM_SETTING_PPPOE_SERVICE        "service"
 

 

 

 

 

-

+

 
NM_SETTING_PPPOE_USERNAME

-
#define NM_SETTING_PPPOE_USERNAME "username"
+
#define NM_SETTING_PPPOE_USERNAME       "username"
 

 

 

 

 

-

+

 
NM_SETTING_PPPOE_PASSWORD

-
#define NM_SETTING_PPPOE_PASSWORD "password"
+
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

 

 

 

 

-

+

+
NM_SETTING_PPPOE_PASSWORD_FLAGS

+
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+

+

+

+

+

+

 
NMSettingPPPOE

 
typedef struct _NMSettingPPPOE NMSettingPPPOE;

 

 

 

 

-

+

 
NMSettingPPPOEClass

 
typedef struct {
 	NMSettingClass parent;
@@ -181,105 +189,65 @@ const char *        
+

 
nm_setting_pppoe_get_type ()

 
GType               nm_setting_pppoe_get_type           (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_pppoe_new ()

 
NMSetting *         nm_setting_pppoe_new                (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_pppoe_get_service ()

 
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_pppoe_get_username ()

 
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_pppoe_get_password ()

 
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

 

 

+

+

+

+
nm_setting_pppoe_get_password_flags ()

+
NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
+                                                        (NMSettingPPPOE *setting);

 

-
-

 
 
 

 
setting :

+the NMSettingPPPOE
 
 

 

 
Returns :

+the NMSettingSecretFlags pertaining to the "password"
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "password" property

 
  "password"                 gchar*                : Read / Write

 

@@ -288,7 +256,17 @@ Password used to authenticate with the PPPoE service.
 
Default value: NULL

 

 

-

+

+
The "password-flags" property

+
  "password-flags"           guint                 : Read / Write

+

+Flags indicating how to handle "password":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "service" property

 
  "service"                  gchar*                : Read / Write

 

@@ -300,7 +278,7 @@ access concentrators or a specific service is known to be required.
 
Default value: NULL

 

 

-

+

 
The "username" property

 
  "username"                 gchar*                : Read / Write

 

@@ -312,6 +290,6 @@ Username used to authenticate with the PPPoE service.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 9d8082bd..5e5483ec 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_SERIAL_SETTING_NAME
-enum                NMSettingSerialError;
+
#define             NM_SETTING_SERIAL_SETTING_NAME
+enum                NMSettingSerialError;
 #define             NM_TYPE_SETTING_SERIAL_ERROR
 #define             NM_SETTING_SERIAL_ERROR
 GQuark              nm_setting_serial_error_quark       (void);
@@ -62,15 +62,19 @@ enum                guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingSerialError
+

 
   GObject
    +----NMSetting
          +----NMSettingSerial
 

 

-

+

 
Properties

 
   "baud"                     guint                 : Read / Write / Construct
@@ -80,14 +84,14 @@ enum                stopbits"                 guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_SERIAL_SETTING_NAME

 
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

@@ -95,7 +99,7 @@ enum                
+

 
enum NMSettingSerialError

 
typedef enum
 {
@@ -109,7 +113,7 @@ enum                
+

 
NM_TYPE_SETTING_SERIAL_ERROR

 
#define NM_TYPE_SETTING_SERIAL_ERROR (nm_setting_serial_error_get_type ()) 
 

@@ -117,7 +121,7 @@ enum                
+

 
NM_SETTING_SERIAL_ERROR

 
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 

@@ -125,22 +129,14 @@ enum                
+

 
nm_setting_serial_error_quark ()

 
GQuark              nm_setting_serial_error_quark       (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -148,7 +144,7 @@ enum                
+

 
NM_SETTING_SERIAL_BITS

 
#define NM_SETTING_SERIAL_BITS "bits"
 

@@ -156,7 +152,7 @@ enum                
+

 
NM_SETTING_SERIAL_PARITY

 
#define NM_SETTING_SERIAL_PARITY "parity"
 

@@ -164,7 +160,7 @@ enum                
+

 
NM_SETTING_SERIAL_STOPBITS

 
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

@@ -172,7 +168,7 @@ enum                
+

 
NM_SETTING_SERIAL_SEND_DELAY

 
#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 

@@ -180,14 +176,14 @@ enum                
+

 
NMSettingSerial

 
typedef struct _NMSettingSerial NMSettingSerial;

 

 

 

 

-

+

 
NMSettingSerialClass

 
typedef struct {
 	NMSettingClass parent;
@@ -203,149 +199,58 @@ enum                
+

 
nm_setting_serial_get_type ()

 
GType               nm_setting_serial_get_type          (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_serial_new ()

 
NMSetting *         nm_setting_serial_new               (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_serial_get_baud ()

 
guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_serial_get_bits ()

 
guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_serial_get_parity ()

 
char                nm_setting_serial_get_parity        (NMSettingSerial *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_serial_get_stopbits ()

 
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_serial_get_send_delay ()

 
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "baud" property

 
  "baud"                     guint                 : Read / Write / Construct

 

@@ -356,7 +261,7 @@ ignore speed settings and use the highest available speed.
 
Default value: 57600

 

 

-

+

 
The "bits" property

 
  "bits"                     guint                 : Read / Write / Construct

 

@@ -366,7 +271,7 @@ Byte-width of the serial communication.
 
Default value: 8

 

 

-

+

 
The "parity" property

 
  "parity"                   gchar                 : Read / Write / Construct

 

@@ -377,7 +282,7 @@ odd parity, or 'n' for no parity.
 
Default value: 110

 

 

-

+

 
The "send-delay" property

 
  "send-delay"               guint64               : Read / Write / Construct

 

@@ -386,7 +291,7 @@ Time to delay between each byte sent to the modem, in microseconds.
 
Default value: 0

 

 

-

+

 
The "stopbits" property

 
  "stopbits"                 guint                 : Read / Write / Construct

 

@@ -400,6 +305,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 311f1008..e8cd2fb9 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_VPN_SETTING_NAME
-enum                NMSettingVpnError;
+
#define             NM_SETTING_VPN_SETTING_NAME
+enum                NMSettingVpnError;
 #define             NM_TYPE_SETTING_VPN_ERROR
 #define             NM_SETTING_VPN_ERROR
 GQuark              nm_setting_vpn_error_quark          (void);
@@ -52,7 +52,7 @@ enum                NM_SETTING_VPN_SECRETS
                     NMSettingVPN;
                     NMSettingVPNClass;
-void                (*VPNIterFunc)                      (const char *key,
+void                (*NMVPNIterFunc)                    (const char *key,
                                                          const char *value,
                                                          gpointer user_data);
 GType               nm_setting_vpn_get_type             (void);
@@ -67,7 +67,7 @@ const char *        void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
                                                          const char *key);
 void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         VPNIterFunc func,
+                                                         NMVPNIterFunc func,
                                                          gpointer user_data);
 void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
                                                          const char *key,
@@ -77,19 +77,23 @@ const char *        void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);
 void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         VPNIterFunc func,
+                                                         NMVPNIterFunc func,
                                                          gpointer user_data);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingVpnError
+

 
   GObject
    +----NMSetting
          +----NMSettingVPN
 

 

-

+

 
Properties

 
   "data"                     GHashTable_gchararray+gchararray_*  : Read / Write
@@ -98,14 +102,14 @@ const char *        user-name"                gchar*                : Read / Write
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_VPN_SETTING_NAME

 
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

@@ -113,7 +117,7 @@ const char *        
+

 
enum NMSettingVpnError

 
typedef enum
 {
@@ -126,7 +130,7 @@ const char *        
+

 
NM_TYPE_SETTING_VPN_ERROR

 
#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ()) 
 

@@ -134,7 +138,7 @@ const char *        
+

 
NM_SETTING_VPN_ERROR

 
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 

@@ -142,22 +146,14 @@ const char *        
+

 
nm_setting_vpn_error_quark ()

 
GQuark              nm_setting_vpn_error_quark          (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_VPN_SERVICE_TYPE

 
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

@@ -165,7 +161,7 @@ const char *        
+

 
NM_SETTING_VPN_USER_NAME

 
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

@@ -173,7 +169,7 @@ const char *        
+

 
NM_SETTING_VPN_DATA

 
#define NM_SETTING_VPN_DATA         "data"
 

@@ -181,7 +177,7 @@ const char *        
+

 
NM_SETTING_VPN_SECRETS

 
#define NM_SETTING_VPN_SECRETS      "secrets"
 

@@ -189,14 +185,14 @@ const char *        
+

 
NMSettingVPN

 
typedef struct _NMSettingVPN NMSettingVPN;

 

 

 

 

-

+

 
NMSettingVPNClass

 
typedef struct {
 	NMSettingClass parent;
@@ -212,330 +208,156 @@ const char *        
-
VPNIterFunc ()

-
void                (*VPNIterFunc)                      (const char *key,
+

+
NMVPNIterFunc ()

+
void                (*NMVPNIterFunc)                    (const char *key,
                                                          const char *value,
                                                          gpointer user_data);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


key :

-
value :

-
user_data :

-

 

 

-

+

 
nm_setting_vpn_get_type ()

 
GType               nm_setting_vpn_get_type             (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_vpn_new ()

 
NMSetting *         nm_setting_vpn_new                  (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_vpn_get_service_type ()

 
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_vpn_get_user_name ()

 
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_vpn_add_data_item ()

 
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *item);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
item :

-

 

 

-

+

 
nm_setting_vpn_get_data_item ()

 
const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
                                                          const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
Returns :

-

 

 

-

+

 
nm_setting_vpn_remove_data_item ()

 
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
                                                          const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-

 

 

-

+

 
nm_setting_vpn_foreach_data_item ()

 
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         VPNIterFunc func,
+                                                         NMVPNIterFunc func,
                                                          gpointer user_data);

 

+Iterates all data items stored in this setting
 

 

-
-
-

 
 
 

 
setting :

+a NMSettingVPN
 
 

 

 
func :

+an user provided function. [scope call]
 
 

 

 
user_data :

+data to be passed to func
 
 

 
 

 

 

-

+

 
nm_setting_vpn_add_secret ()

 
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *secret);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
secret :

-

 

 

-

+

 
nm_setting_vpn_get_secret ()

 
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
Returns :

-

 

 

-

+

 
nm_setting_vpn_remove_secret ()

 
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-

 

 

-

+

 
nm_setting_vpn_foreach_secret ()

 
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         VPNIterFunc func,
+                                                         NMVPNIterFunc func,
                                                          gpointer user_data);

 

+Iterates all secrets stored in this setting.
 

 

-
-
-

 
 
 

 
setting :

+a NMSettingVPN
 
 

 

 
func :

+an user provided function. [scope call]
 
 

 

 
user_data :

+data to be passed to func
 
 

 
 

 

 

-

+

 
Property Details

-

+

 
The "data" property

 
  "data"                     GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -544,7 +366,7 @@ and values must be strings.
 

 

 

-

+

 
The "secrets" property

 
  "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -553,7 +375,7 @@ passwords or private keys.  Both keys and values must be strings.
 

 

 

-

+

 
The "service-type" property

 
  "service-type"             gchar*                : Read / Write

 

@@ -564,7 +386,7 @@ plugin.
 
Default value: NULL

 

 

-

+

 
The "user-name" property

 
  "user-name"                gchar*                : Read / Write

 
User name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.

@@ -574,6 +396,6 @@ plugin.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 19b43451..d079de3a 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRED_SETTING_NAME
-enum                NMSettingWiredError;
+
#define             NM_SETTING_WIRED_SETTING_NAME
+enum                NMSettingWiredError;
 #define             NM_TYPE_SETTING_WIRED_ERROR
 #define             NM_SETTING_WIRED_ERROR
 GQuark              nm_setting_wired_error_quark        (void);
@@ -87,15 +87,19 @@ const char *        const char *key);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWiredError
+

 
   GObject
    +----NMSetting
          +----NMSettingWired
 

 

-

+

 
Properties

 
   "auto-negotiate"           gboolean              : Read / Write / Construct
@@ -110,14 +114,14 @@ const char *        speed"                    guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRED_SETTING_NAME

 
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

@@ -125,7 +129,7 @@ const char *        
+

 
enum NMSettingWiredError

 
typedef enum
 {
@@ -138,7 +142,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRED_ERROR

 
#define NM_TYPE_SETTING_WIRED_ERROR (nm_setting_wired_error_get_type ()) 
 

@@ -146,7 +150,7 @@ const char *        
+

 
NM_SETTING_WIRED_ERROR

 
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 

@@ -154,22 +158,14 @@ const char *        
+

 
nm_setting_wired_error_quark ()

 
GQuark              nm_setting_wired_error_quark        (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_WIRED_PORT

 
#define NM_SETTING_WIRED_PORT "port"
 

@@ -177,7 +173,7 @@ const char *        
+

 
NM_SETTING_WIRED_SPEED

 
#define NM_SETTING_WIRED_SPEED "speed"
 

@@ -185,7 +181,7 @@ const char *        
+

 
NM_SETTING_WIRED_DUPLEX

 
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

@@ -193,7 +189,7 @@ const char *        
+

 
NM_SETTING_WIRED_AUTO_NEGOTIATE

 
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

@@ -201,7 +197,7 @@ const char *        
+

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

@@ -209,7 +205,7 @@ const char *        
+

 
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

@@ -217,7 +213,7 @@ const char *        
+

 
NM_SETTING_WIRED_MTU

 
#define NM_SETTING_WIRED_MTU "mtu"
 

@@ -225,7 +221,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_SUBCHANNELS

 
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 

@@ -233,7 +229,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_NETTYPE

 
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

@@ -241,7 +237,7 @@ const char *        
+

 
NM_SETTING_WIRED_S390_OPTIONS

 
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

@@ -249,14 +245,14 @@ const char *        
+

 
NMSettingWired

 
typedef struct _NMSettingWired NMSettingWired;

 

 

 

 

-

+

 
NMSettingWiredClass

 
typedef struct {
 	NMSettingClass parent;
@@ -272,192 +268,71 @@ const char *        
+

 
nm_setting_wired_get_type ()

 
GType               nm_setting_wired_get_type           (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wired_new ()

 
NMSetting *         nm_setting_wired_new                (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wired_get_port ()

 
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_speed ()

 
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_duplex ()

 
const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_auto_negotiate ()

 
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_mac_address ()

 
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_cloned_mac_address ()

 
const GByteArray *  nm_setting_wired_get_cloned_mac_address
                                                         (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_mtu ()

 
guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_get_s390_subchannels ()

 
const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);

@@ -476,15 +351,14 @@ conjunction with that device.
 
 
 
Returns :

- a GPtrArray of strings, each specifying one subchannel the
-s390 device uses to communicate to the host.
-
+a GPtrArray of strings, each specifying one subchannel the
+s390 device uses to communicate to the host.
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_nettype ()

 
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

 

@@ -501,14 +375,13 @@ of 'qeth', 'lcs', or 'ctc'.
 
 
 
Returns :

- the s390 device type
-
+the s390 device type
 
 
 

 

 

-

+

 
nm_setting_wired_get_num_s390_options ()

 
guint32             nm_setting_wired_get_num_s390_options
                                                         (NMSettingWired *setting);

@@ -527,14 +400,13 @@ option individually using Returns :

- the number of s390-specific device options
-
+the number of s390-specific device options
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_option ()

 
gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
                                                          guint32 idx,
@@ -558,33 +430,30 @@ such as during option iteration.
 
 
idx :

 index of the desired option, from 0 to
-nm_setting_wired_get_num_s390_options() - 1
-
+nm_setting_wired_get_num_s390_options() - 1
 
 
 
out_key :

 on return, the key name of the s390 specific option; this value is
-owned by the setting and should not be modified
-
+owned by the setting and should not be modified
 
 
 
out_value :

 on return, the value of the key of the s390 specific option; this
-value is owned by the setting and should not be modified
-
+value is owned by the setting and should not be modified
 
 
 
Returns :

- TRUE on success if the index was valid and an option was found,
+
+TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
-currently held by the setting)
-
+currently held by the setting)
 
 
 

 

 

-

+

 
nm_setting_wired_get_s390_option_by_key ()

 
const char *        nm_setting_wired_get_s390_option_by_key
                                                         (NMSettingWired *setting,
@@ -603,91 +472,44 @@ Returns the value associated with the s390-specific option specified by
 
 
 
key :

-the key for which to retrieve the value
-
+the key for which to retrieve the value
 
 
 
Returns :

- the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified
-
+the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified
 
 
 

 

 

-

+

 
nm_setting_wired_add_s390_option ()

 
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
                                                          const char *key,
                                                          const char *item);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
item :

-
Returns :

-

 

 

-

+

 
nm_setting_wired_remove_s390_option ()

 
gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                                          const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
key :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "auto-negotiate" property

 
  "auto-negotiate"           gboolean              : Read / Write / Construct

 
If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.

 
Default value: TRUE

 

 

-

+

 
The "cloned-mac-address" property

 
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

 

@@ -696,7 +518,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

-

+

 
The "duplex" property

 
  "duplex"                   gchar*                : Read / Write

 

@@ -706,7 +528,7 @@ Either 'half' or 'full'.
 
Default value: NULL

 

 

-

+

 
The "mac-address" property

 
  "mac-address"              GArray_guchar_*       : Read / Write

 

@@ -716,7 +538,7 @@ of the device (i.e. MAC spoofing).
 

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -726,7 +548,7 @@ breaking larger packets up into multiple Ethernet frames.
 
Default value: 0

 

 

-

+

 
The "port" property

 
  "port"                     gchar*                : Read / Write

 

@@ -738,7 +560,7 @@ If the device supports only one port type, this setting is ignored.
 
Default value: NULL

 

 

-

+

 
The "s390-nettype" property

 
  "s390-nettype"             gchar*                : Read / Write

 

@@ -748,7 +570,7 @@ the different types of virtual network devices available on s390 systems.
 
Default value: NULL

 

 

-

+

 
The "s390-options" property

 
  "s390-options"             GHashTable_gchararray+gchararray_*  : Read / Write

 

@@ -759,7 +581,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

 

-

+

 
The "s390-subchannels" property

 
  "s390-subchannels"         GPtrArray_gchararray_*  : Read / Write

 

@@ -772,7 +594,7 @@ composed of hexadecimal characters and the period (.) character.
 

 

 

-

+

 
The "speed" property

 
  "speed"                    guint                 : Read / Write / Construct

 

@@ -785,6 +607,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 34d1341b..21d51d29 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRELESS_SETTING_NAME
-enum                NMSettingWirelessError;
+
#define             NM_SETTING_WIRELESS_SETTING_NAME
+enum                NMSettingWirelessError;
 #define             NM_TYPE_SETTING_WIRELESS_ERROR
 #define             NM_SETTING_WIRELESS_ERROR
 GQuark              nm_setting_wireless_error_quark     (void);
@@ -58,6 +58,8 @@ enum                NM_SETTING_WIRELESS_MTU
 #define             NM_SETTING_WIRELESS_SEEN_BSSIDS
 #define             NM_SETTING_WIRELESS_SEC
+#define             NM_SETTING_WIRELESS_MODE_ADHOC
+#define             NM_SETTING_WIRELESS_MODE_INFRA
                     NMSettingWireless;
                     NMSettingWirelessClass;
 GType               nm_setting_wireless_get_type        (void);
@@ -83,21 +85,25 @@ const char *        gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         guint32 ap_flags,
-                                                         guint32 ap_wpa,
-                                                         guint32 ap_rsn,
-                                                         guint32 ap_mode);
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWirelessError
+

 
   GObject
    +----NMSetting
          +----NMSettingWireless
 

 

-

+

 
Properties

 
   "band"                     gchar*                : Read / Write
@@ -114,14 +120,14 @@ const char *        tx-power"                 guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRELESS_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

@@ -129,7 +135,7 @@ const char *        
+

 
enum NMSettingWirelessError

 
typedef enum
 {
@@ -144,7 +150,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRELESS_ERROR

 
#define NM_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
 

@@ -152,7 +158,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_ERROR

 
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 

@@ -160,22 +166,14 @@ const char *        
+

 
nm_setting_wireless_error_quark ()

 
GQuark              nm_setting_wireless_error_quark     (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
NM_SETTING_WIRELESS_SSID

 
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

@@ -183,7 +181,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MODE

 
#define NM_SETTING_WIRELESS_MODE        "mode"
 

@@ -191,7 +189,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_BAND

 
#define NM_SETTING_WIRELESS_BAND        "band"
 

@@ -199,7 +197,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_CHANNEL

 
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

@@ -207,7 +205,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_BSSID

 
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

@@ -215,7 +213,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_RATE

 
#define NM_SETTING_WIRELESS_RATE        "rate"
 

@@ -223,7 +221,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_TX_POWER

 
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

@@ -231,7 +229,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

@@ -239,7 +237,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

@@ -247,7 +245,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_MTU

 
#define NM_SETTING_WIRELESS_MTU         "mtu"
 

@@ -255,7 +253,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SEEN_BSSIDS

 
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

@@ -263,7 +261,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SEC

 
#define NM_SETTING_WIRELESS_SEC         "security"
 

@@ -271,14 +269,30 @@ const char *        
+

+
NM_SETTING_WIRELESS_MODE_ADHOC

+
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+

+

+

+

+

+

+
NM_SETTING_WIRELESS_MODE_INFRA

+
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+

+

+

+

+

+

 
NMSettingWireless

 
typedef struct _NMSettingWireless NMSettingWireless;

 

 

 

 

-

+

 
NMSettingWirelessClass

 
typedef struct {
 	NMSettingClass parent;
@@ -294,414 +308,138 @@ const char *        
+

 
nm_setting_wireless_get_type ()

 
GType               nm_setting_wireless_get_type        (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wireless_new ()

 
NMSetting *         nm_setting_wireless_new             (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wireless_get_ssid ()

 
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_mode ()

 
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_band ()

 
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_channel ()

 
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_bssid ()

 
const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_rate ()

 
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_tx_power ()

 
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_mac_address ()

 
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_cloned_mac_address ()

 
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
                                                         (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_mtu ()

 
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_security ()

 
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_add_seen_bssid ()

 
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
                                                          const char *bssid);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
bssid :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_num_seen_bssids ()

 
guint32             nm_setting_wireless_get_num_seen_bssids
                                                         (NMSettingWireless *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_get_seen_bssid ()

 
const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_ap_security_compatible ()

 
gboolean            nm_setting_wireless_ap_security_compatible
                                                         (NMSettingWireless *s_wireless,
                                                          NMSettingWirelessSecurity *s_wireless_sec,
-                                                         guint32 ap_flags,
-                                                         guint32 ap_wpa,
-                                                         guint32 ap_rsn,
-                                                         guint32 ap_mode);

-

-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


s_wireless :

-
s_wireless_sec :

-
ap_flags :

-
ap_wpa :

-
ap_rsn :

-
ap_mode :

-
Returns :

-

+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);

+

+

 

 

-

+

 
Property Details

-

+

 
The "band" property

 
  "band"                     gchar*                : Read / Write

 

@@ -715,7 +453,7 @@ capability and may not work with all drivers.
 
Default value: NULL

 

 

-

+

 
The "bssid" property

 
  "bssid"                    GArray_guchar_*       : Read / Write

 

@@ -726,7 +464,7 @@ creating an Ad-Hoc network and is unlikely to in the future.
 

 

 

-

+

 
The "channel" property

 
  "channel"                  guint                 : Read / Write / Construct

 

@@ -738,7 +476,7 @@ also requires the 'band' property to be set.
 
Default value: 0

 

 

-

+

 
The "cloned-mac-address" property

 
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

 

@@ -747,7 +485,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

-

+

 
The "mac-address" property

 
  "mac-address"              GArray_guchar_*       : Read / Write

 

@@ -757,7 +495,7 @@ of the device (i.e. MAC spoofing).
 

 

 

-

+

 
The "mode" property

 
  "mode"                     gchar*                : Read / Write

 

@@ -767,7 +505,7 @@ infrastructure is assumed.
 
Default value: NULL

 

 

-

+

 
The "mtu" property

 
  "mtu"                      guint                 : Read / Write / Construct

 

@@ -777,7 +515,7 @@ breaking larger packets up into multiple Ethernet frames.
 
Default value: 0

 

 

-

+

 
The "rate" property

 
  "rate"                     guint                 : Read / Write / Construct

 

@@ -789,7 +527,7 @@ support setting a static bitrate.
 
Default value: 0

 

 

-

+

 
The "security" property

 
  "security"                 gchar*                : Read / Write

 

@@ -800,7 +538,7 @@ the connection contains a valid 802-11-wireless-security setting.
 
Default value: NULL

 

 

-

+

 
The "seen-bssids" property

 
  "seen-bssids"              GSList_gchararray_*   : Read / Write

 

@@ -814,7 +552,7 @@ find hidden APs by matching up scan results with the BSSIDs in this list.
 

 

 

-

+

 
The "ssid" property

 
  "ssid"                     GArray_guchar_*       : Read / Write

 

@@ -822,7 +560,7 @@ SSID of the WiFi network.
 

 

 

-

+

 
The "tx-power" property

 
  "tx-power"                 guint                 : Read / Write / Construct

 

@@ -836,6 +574,6 @@ devices support setting a static transmit power.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 9642f812..7fdbc952 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
                   Properties
 
 
-

+

 

 

 
@@ -39,10 +39,10 @@
 
 
 

-

+

 
Synopsis

-
#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
-enum                NMSettingWirelessSecurityError;
+
#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
+enum                NMSettingWirelessSecurityError;
 #define             NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
 #define             NM_SETTING_WIRELESS_SECURITY_ERROR
 GQuark              nm_setting_wireless_security_error_quark
@@ -59,9 +59,12 @@ enum                NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
 #define             NM_SETTING_WIRELESS_SECURITY_PSK
+#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
+#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
                     NMSettingWirelessSecurity;
                     NMSettingWirelessSecurityClass;
 GType               nm_setting_wireless_security_get_type
@@ -110,10 +113,14 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
+NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
+                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
+NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
+                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);
@@ -125,29 +132,38 @@ const char *        NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);
+NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
+                                                        (NMSettingWirelessSecurity *setting);
 NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);
 

 

-

+

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWirelessSecurityError
+

 
   GObject
    +----NMSetting
          +----NMSettingWirelessSecurity
 

 

-

+

 
Properties

 
   "auth-alg"                 gchar*                : Read / Write
   "group"                    GSList_gchararray_*   : Read / Write
   "key-mgmt"                 gchar*                : Read / Write
   "leap-password"            gchar*                : Read / Write
+  "leap-password-flags"      guint                 : Read / Write
   "leap-username"            gchar*                : Read / Write
   "pairwise"                 GSList_gchararray_*   : Read / Write
   "proto"                    GSList_gchararray_*   : Read / Write
   "psk"                      gchar*                : Read / Write
+  "psk-flags"                guint                 : Read / Write
+  "wep-key-flags"            guint                 : Read / Write
   "wep-key-type"             guint                 : Read / Write / Construct
   "wep-key0"                 gchar*                : Read / Write
   "wep-key1"                 gchar*                : Read / Write
@@ -156,14 +172,14 @@ const char *        wep-tx-keyidx"            guint                 : Read / Write / Construct
 

 

-

+

 
Description

 

 

 

-

+

 
Details

-

+

 
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

@@ -171,7 +187,7 @@ const char *        
+

 
enum NMSettingWirelessSecurityError

 
typedef enum
 {
@@ -188,7 +204,7 @@ const char *        
+

 
NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR

 
#define NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR (nm_setting_wireless_security_error_get_type ()) 
 

@@ -196,7 +212,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_ERROR

 
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 

@@ -204,23 +220,15 @@ const char *        
+

 
nm_setting_wireless_security_error_quark ()

 
GQuark              nm_setting_wireless_security_error_quark
                                                         (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -234,7 +242,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

 
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

@@ -242,7 +250,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

@@ -250,7 +258,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

 
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

@@ -258,7 +266,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_PROTO

 
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

@@ -266,7 +274,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

 
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

@@ -274,7 +282,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_GROUP

 
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

@@ -282,7 +290,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 

@@ -290,7 +298,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

@@ -298,7 +306,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

@@ -306,7 +314,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

@@ -314,7 +322,7 @@ const char *        
+

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

@@ -322,7 +330,23 @@ const char *        
+

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+

+

+

+

+

+

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+

+

+

+

+

+

 
NM_SETTING_WIRELESS_SECURITY_PSK

 
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

@@ -330,7 +354,15 @@ const char *        
+

+
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+

+

+

+

+

+

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

@@ -338,22 +370,22 @@ const char *        
-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+

+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

 

 

 

 

-

+

 
NMSettingWirelessSecurity

 
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

 

 

 

 

-

+

 
NMSettingWirelessSecurityClass

 
typedef struct {
 	NMSettingClass parent;
@@ -369,522 +401,236 @@ const char *        
+

 
nm_setting_wireless_security_get_type ()

 
GType               nm_setting_wireless_security_get_type
                                                         (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wireless_security_new ()

 
NMSetting *         nm_setting_wireless_security_new    (void);

 

 

-

--
-
-
-
-


Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_key_mgmt ()

 
const char *        nm_setting_wireless_security_get_key_mgmt
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_num_protos ()

 
guint32             nm_setting_wireless_security_get_num_protos
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_proto ()

 
const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_add_proto ()

 
gboolean            nm_setting_wireless_security_add_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *proto);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
proto :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_remove_proto ()

 
void                nm_setting_wireless_security_remove_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_wireless_security_clear_protos ()

 
void                nm_setting_wireless_security_clear_protos
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_wireless_security_get_num_pairwise ()

 
guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_pairwise ()

 
const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_add_pairwise ()

 
gboolean            nm_setting_wireless_security_add_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *pairwise);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
pairwise :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_remove_pairwise ()

 
void                nm_setting_wireless_security_remove_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_wireless_security_clear_pairwise ()

 
void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_wireless_security_get_num_groups ()

 
guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_group ()

 
const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_add_group ()

 
gboolean            nm_setting_wireless_security_add_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *group);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
group :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_remove_group ()

 
void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
i :

-

 

 

-

+

 
nm_setting_wireless_security_clear_groups ()

 
void                nm_setting_wireless_security_clear_groups
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-


setting :

-

 

 

-

+

 
nm_setting_wireless_security_get_psk ()

 
const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

+

+

+
nm_setting_wireless_security_get_psk_flags ()

+
NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
+                                                        (NMSettingWirelessSecurity *setting);

 

-
-

 
 
 

 
setting :

+the NMSettingWirelessSecurity
 
 

 

 
Returns :

+the NMSettingSecretFlags pertaining to the
+"psk"
 
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_leap_username ()

 
const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_leap_password ()

 
const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

+

+

+
nm_setting_wireless_security_get_leap_password_flags ()

+
NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
+                                                        (NMSettingWirelessSecurity *setting);

 

-
-

 
 
 

 
setting :

+the NMSettingWirelessSecurity
 
 

 

 
Returns :

+the NMSettingSecretFlags pertaining to the
+"leap-password"
 
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_wep_key ()

 
const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
idx :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_set_wep_key ()

 
void                nm_setting_wireless_security_set_wep_key
                                                         (NMSettingWirelessSecurity *setting,
@@ -892,100 +638,55 @@ const char *        const char *key);

 

 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :

-
idx :

-
key :

-

 

 

-

+

 
nm_setting_wireless_security_get_wep_tx_keyidx ()

 
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
nm_setting_wireless_security_get_auth_alg ()

 
const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);

 

 

+

+

+

+
nm_setting_wireless_security_get_wep_key_flags ()

+
NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
+                                                        (NMSettingWirelessSecurity *setting);

 

-
-
+

 
 
 

 
setting :

+the NMSettingWirelessSecurity
 
 

 

 
Returns :

-the NMSettingSecretFlags pertaining to the all WEP keys
 

 
 

 

 

-

+

 
nm_setting_wireless_security_get_wep_key_type ()

 
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


setting :

-
Returns :

-

 

 

-

+

 
Property Details

-

+

 
The "auth-alg" property

 
  "auth-alg"                 gchar*                : Read / Write

 

@@ -998,7 +699,7 @@ the 'leap-username' and 'leap-password' properties must be specified.
 
Default value: NULL

 

 

-

+

 
The "group" property

 
  "group"                    GSList_gchararray_*   : Read / Write

 

@@ -1008,7 +709,7 @@ one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

-

+

 
The "key-mgmt" property

 
  "key-mgmt"                 gchar*                : Read / Write

 

@@ -1020,7 +721,7 @@ any WiFi connection that uses security.
 
Default value: NULL

 

 

-

+

 
The "leap-password" property

 
  "leap-password"            gchar*                : Read / Write

 

@@ -1030,7 +731,17 @@ The login password for legacy LEAP connections (ie, key-mgmt =
 
Default value: NULL

 

 

-

+

+
The "leap-password-flags" property

+
  "leap-password-flags"      guint                 : Read / Write

+

+Flags indicating how to handle "leap-password".
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "leap-username" property

 
  "leap-username"            gchar*                : Read / Write

 

@@ -1040,7 +751,7 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 
Default value: NULL

 

 

-

+

 
The "pairwise" property

 
  "pairwise"                 GSList_gchararray_*   : Read / Write

 

@@ -1050,7 +761,7 @@ specified pairwise encryption capabilities.  Each element may be one of
 

 

 

-

+

 
The "proto" property

 
  "proto"                    GSList_gchararray_*   : Read / Write

 

@@ -1060,7 +771,7 @@ not specified, both WPA and RSN connections are allowed.
 

 

 

-

+

 
The "psk" property

 
  "psk"                      gchar*                : Read / Write

 

@@ -1074,7 +785,27 @@ connecting to the WiFi network.
 
Default value: NULL

 

 

-

+

+
The "psk-flags" property

+
  "psk-flags"                guint                 : Read / Write

+

+Flags indicating how to handle "psk"
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

+
The "wep-key-flags" property

+
  "wep-key-flags"            guint                 : Read / Write

+

+Flags indicating how to handle NMSettingWirelessSecurity WEP keys.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "wep-key-type" property

 
  "wep-key-type"             guint                 : Read / Write / Construct

 

@@ -1090,7 +821,7 @@ actual WEP key.
 
Default value: 0

 

 

-

+

 
The "wep-key0" property

 
  "wep-key0"                 gchar*                : Read / Write

 

@@ -1100,7 +831,7 @@ Index 0 WEP key.  This is the WEP key used in most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key1" property

 
  "wep-key1"                 gchar*                : Read / Write

 

@@ -1110,7 +841,7 @@ Index 1 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key2" property

 
  "wep-key2"                 gchar*                : Read / Write

 

@@ -1120,7 +851,7 @@ Index 2 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-key3" property

 
  "wep-key3"                 gchar*                : Read / Write

 

@@ -1130,7 +861,7 @@ Index 3 WEP key.  This WEP index is not used by most networks.  See the
 
Default value: NULL

 

 

-

+

 
The "wep-tx-keyidx" property

 
  "wep-tx-keyidx"            guint                 : Read / Write / Construct

 

@@ -1146,6 +877,6 @@ Linksys WRT54G) number the keys 1 - 4.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 563fa60f..e0a1c869 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -19,18 +19,53 @@
 libnm-util Reference Manual
  
 
-E
+
+O
+                      | 
+                   A
+                      | 
+                   E
+                      | 
+                   T
+                      | 
+                   S
+                      | 
+                   T
+
 
-

+

 

 Annotation Glossary

+
O

+

+out

+
Parameter for returning results. Default is transfer full.

+
A

+

+allow-none

+
NULL is ok, both for passing and for returning.

 
E

 

 element-type

 
Generics and defining elements of containers and arrays.

+
T

+

+transfer container

+
Free data container after the code is done.

+
S

+

+scope call

+
The callback is valid only during the call to the method.

+
T

+

+transfer full

+
Free data after the code is done.

+

+transfer none

+
Don't free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 195b24d9..b6776b7d 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -23,16 +23,8 @@
 
 C
                       | 
-                   D
-                      | 
-                   E
-                      | 
-                   G
-                      | 
                    I
                       | 
-                   P
-                      | 
                    S
                       | 
                    T
@@ -44,212 +36,209 @@
                    W
 
 
-

+

 

 API Index

 
C

 

-NMConnection, struct in NMConnection
+NMConnection, struct in NMConnection
 

 

 

-NMConnection::secrets-updated, object signal in NMConnection
+NMConnection::secrets-updated, object signal in NMConnection
 

 

 

-NMConnection:path, object property in NMConnection
+NMConnection:path, object property in NMConnection
 

 

 

-NMConnection:scope, object property in NMConnection
+NMConnectionClass, struct in NMConnection
 

 

 

-NMConnectionClass, struct in NMConnection
+NMConnectionError, enum in NMConnection
 

 

 

-NMConnectionError, enum in NMConnection
+nm_connection_add_setting, function in NMConnection
 

 

 

-NMConnectionScope, enum in NMConnection
+nm_connection_clear_secrets, function in NMConnection
 

 

 

-nm_connection_add_setting, function in NMConnection
+nm_connection_compare, function in NMConnection
 

 

 

-nm_connection_clear_secrets, function in NMConnection
+nm_connection_create_setting, function in NMConnection
 

 

 

-nm_connection_compare, function in NMConnection
+nm_connection_diff, function in NMConnection
 

 

 

-nm_connection_create_setting, function in NMConnection
+nm_connection_dump, function in NMConnection
 

 

 

-nm_connection_diff, function in NMConnection
+nm_connection_duplicate, function in NMConnection
 

 

 

-nm_connection_dump, function in NMConnection
+NM_CONNECTION_ERROR, macro in NMConnection
 

 

 

-nm_connection_duplicate, function in NMConnection
+nm_connection_error_quark, function in NMConnection
 

 

 

-NM_CONNECTION_ERROR, macro in NMConnection
+nm_connection_for_each_setting_value, function in NMConnection
 

 

 

-nm_connection_error_quark, function in NMConnection
+nm_connection_get_id, function in NMConnection
 

 

 

-nm_connection_for_each_setting_value, function in NMConnection
+nm_connection_get_path, function in NMConnection
 

 

 

-nm_connection_get_path, function in NMConnection
+nm_connection_get_setting, function in NMConnection
 

 

 

-nm_connection_get_scope, function in NMConnection
+nm_connection_get_setting_802_1x, function in NMConnection
 

 

 

-nm_connection_get_setting, function in NMConnection
+nm_connection_get_setting_bluetooth, function in NMConnection
 

 

 

-nm_connection_get_setting_by_name, function in NMConnection
+nm_connection_get_setting_by_name, function in NMConnection
 

 

 

-nm_connection_get_type, function in NMConnection
+nm_connection_get_setting_cdma, function in NMConnection
 

 

 

-nm_connection_lookup_setting_type, function in NMConnection
+nm_connection_get_setting_connection, function in NMConnection
 

 

 

-nm_connection_lookup_setting_type_by_quark, function in NMConnection
+nm_connection_get_setting_gsm, function in NMConnection
 

 

 

-nm_connection_need_secrets, function in NMConnection
+nm_connection_get_setting_ip4_config, function in NMConnection
 

 

 

-nm_connection_new, function in NMConnection
+nm_connection_get_setting_ip6_config, function in NMConnection
 

 

 

-nm_connection_new_from_hash, function in NMConnection
+nm_connection_get_setting_olpc_mesh, function in NMConnection
 

 

 

-NM_CONNECTION_PATH, macro in NMConnection
+nm_connection_get_setting_ppp, function in NMConnection
 

 

 

-nm_connection_remove_setting, function in NMConnection
+nm_connection_get_setting_pppoe, function in NMConnection
 

 

 

-nm_connection_replace_settings, function in NMConnection
+nm_connection_get_setting_vpn, function in NMConnection
 

 

 

-NM_CONNECTION_SCOPE, macro in NMConnection
+nm_connection_get_setting_wimax, function in NMConnection
 

 

 

-nm_connection_set_path, function in NMConnection
+nm_connection_get_setting_wired, function in NMConnection
 

 

 

-nm_connection_set_scope, function in NMConnection
+nm_connection_get_setting_wireless, function in NMConnection
 

 

 

-nm_connection_to_hash, function in NMConnection
+nm_connection_get_setting_wireless_security, function in NMConnection
 

 

 

-nm_connection_update_secrets, function in NMConnection
+nm_connection_get_type, function in NMConnection
 

 

 

-nm_connection_verify, function in NMConnection
+nm_connection_get_uuid, function in NMConnection
 

 

-
D

 

-nm_debug, macro in nm-utils
+nm_connection_lookup_setting_type, function in NMConnection
 

 

 

-nm_debug_str, macro in nm-utils
+nm_connection_lookup_setting_type_by_quark, function in NMConnection
 

 

-
E

 

-nm_error, macro in nm-utils
+nm_connection_need_secrets, function in NMConnection
 

 

 

-nm_error_str, macro in nm-utils
+nm_connection_new, function in NMConnection
 

 

-
G

 

-nm_get_timestamp, macro in nm-utils
+nm_connection_new_from_hash, function in NMConnection
 

 

 

-NM_GSM_NETWORK_ANY, macro in NMSettingGsm
+NM_CONNECTION_PATH, macro in NMConnection
 

 

 

-NM_GSM_NETWORK_GPRS_EDGE, macro in NMSettingGsm
+nm_connection_remove_setting, function in NMConnection
 

 

 

-NM_GSM_NETWORK_PREFER_GPRS_EDGE, macro in NMSettingGsm
+nm_connection_replace_settings, function in NMConnection
 

 

 

-NM_GSM_NETWORK_PREFER_UMTS_HSPA, macro in NMSettingGsm
+nm_connection_set_path, function in NMConnection
 

 

 

-NM_GSM_NETWORK_UMTS_HSPA, macro in NMSettingGsm
+nm_connection_to_hash, function in NMConnection
 

 

-
I

 

-nm_info, macro in nm-utils
+nm_connection_update_secrets, function in NMConnection
 

 

 

-nm_info_str, macro in nm-utils
+nm_connection_verify, function in NMConnection
 

 

+
I

 

-NMIP4Address, typedef in NMSettingIP4Config
+NMIP4Address, typedef in NMSettingIP4Config
 

 

 

-NMIP4Route, typedef in NMSettingIP4Config
+NMIP4Route, typedef in NMSettingIP4Config
 

 

 

@@ -273,6 +262,10 @@
 

 

 

+nm_ip4_address_get_type, function in NMSettingIP4Config
+

+

+

 nm_ip4_address_new, function in NMSettingIP4Config
 

 

@@ -321,6 +314,10 @@
 
 

 

+nm_ip4_route_get_type, function in NMSettingIP4Config
+

+

+

 nm_ip4_route_new, function in NMSettingIP4Config
 

 

@@ -349,11 +346,11 @@
 
 

 

-NMIP6Address, typedef in NMSettingIP6Config
+NMIP6Address, typedef in NMSettingIP6Config
 

 

 

-NMIP6Route, typedef in NMSettingIP6Config
+NMIP6Route, typedef in NMSettingIP6Config
 

 

 

@@ -377,6 +374,10 @@
 

 

 

+nm_ip6_address_get_type, function in NMSettingIP6Config
+

+

+

 nm_ip6_address_new, function in NMSettingIP6Config
 

 

@@ -425,6 +426,10 @@
 
 

 

+nm_ip6_route_get_type, function in NMSettingIP6Config
+

+

+

 nm_ip6_route_new, function in NMSettingIP6Config
 

 

@@ -452,11 +457,6 @@
 nm_ip6_route_unref, function in NMSettingIP6Config
 
 

-
P

-

-nm_print_backtrace, macro in nm-utils
-

-

 
S

 

 NMSetting, struct in NMSetting
@@ -495,6 +495,10 @@
 

 

 

+NMSetting8021x:password-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

 

@@ -535,6 +539,10 @@
 
 

 

+NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:private-key, object property in NMSetting8021x
 

 

@@ -543,19 +551,19 @@
 
 

 

-NMSetting8021x:system-ca-certs, object property in NMSetting8021x
+NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
 

 

 

-NMSetting8021xCKFormat, enum in NMSetting8021x
+NMSetting8021x:system-ca-certs, object property in NMSetting8021x
 

 

 

-NMSetting8021xCKScheme, enum in NMSetting8021x
+NMSetting8021xCKFormat, enum in NMSetting8021x
 

 

 

-NMSetting8021xCKType, enum in NMSetting8021x
+NMSetting8021xCKScheme, enum in NMSetting8021x
 

 

 

@@ -563,7 +571,7 @@
 

 

 

-NMSetting8021xError, enum in NMSetting8021x
+NMSetting8021xError, enum in NMSetting8021x
 

 

 

@@ -587,7 +595,7 @@
 

 

 

-NMSettingBluetoothError, enum in NMSettingBluetooth
+NMSettingBluetoothError, enum in NMSettingBluetooth
 

 

 

@@ -603,6 +611,10 @@
 

 

 

+NMSettingCdma:password-flags, object property in NMSettingCdma
+

+

+

 NMSettingCdma:username, object property in NMSettingCdma
 

 

@@ -611,7 +623,7 @@
 
 

 

-NMSettingCdmaError, enum in NMSettingCdma
+NMSettingCdmaError, enum in NMSettingCdma
 

 

 

@@ -635,6 +647,10 @@
 

 

 

+NMSettingConnection:permissions, object property in NMSettingConnection
+

+

+

 NMSettingConnection:read-only, object property in NMSettingConnection
 

 

@@ -655,7 +671,7 @@
 
 

 

-NMSettingConnectionError, enum in NMSettingConnection
+NMSettingConnectionError, enum in NMSettingConnection
 

 

 

@@ -663,7 +679,7 @@
 

 

 

-NMSettingError, enum in NMSetting
+NMSettingError, enum in NMSetting
 

 

 

@@ -679,10 +695,6 @@
 

 

 

-NMSettingGsm:band, object property in NMSettingGsm
-

-

-

 NMSettingGsm:home-only, object property in NMSettingGsm
 

 

@@ -703,11 +715,15 @@
 
 

 

+NMSettingGsm:password-flags, object property in NMSettingGsm
+

+

+

 NMSettingGsm:pin, object property in NMSettingGsm
 

 

 

-NMSettingGsm:puk, object property in NMSettingGsm
+NMSettingGsm:pin-flags, object property in NMSettingGsm
 

 

 

@@ -719,7 +735,7 @@
 

 

 

-NMSettingGsmError, enum in NMSettingGsm
+NMSettingGsmError, enum in NMSettingGsm
 

 

 

@@ -731,6 +747,10 @@
 

 

 

+NMSettingHashFlags, enum in NMSetting
+

+

+

 NMSettingIP4Config, struct in NMSettingIP4Config
 

 

@@ -787,7 +807,7 @@
 
 

 

-NMSettingIP4ConfigError, enum in NMSettingIP4Config
+NMSettingIP4ConfigError, enum in NMSettingIP4Config
 

 

 

@@ -835,7 +855,7 @@
 

 

 

-NMSettingIP6ConfigError, enum in NMSettingIP6Config
+NMSettingIP6ConfigError, enum in NMSettingIP6Config
 

 

 

@@ -859,7 +879,7 @@
 

 

 

-NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
+NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
 

 

 

@@ -943,7 +963,7 @@
 

 

 

-NMSettingPPPError, enum in NMSettingPPP
+NMSettingPPPError, enum in NMSettingPPP
 

 

 

@@ -955,6 +975,10 @@
 

 

 

+NMSettingPPPOE:password-flags, object property in NMSettingPPPOE
+

+

+

 NMSettingPPPOE:service, object property in NMSettingPPPOE
 

 

@@ -967,7 +991,11 @@
 
 

 

-NMSettingPPPOEError, enum in NMSettingPPPOE
+NMSettingPPPOEError, enum in NMSettingPPPOE
+

+

+

+NMSettingSecretFlags, enum in NMSetting
 

 

 

@@ -999,7 +1027,7 @@
 

 

 

-NMSettingSerialError, enum in NMSettingSerial
+NMSettingSerialError, enum in NMSettingSerial
 

 

 

@@ -1031,7 +1059,27 @@
 

 

 

-NMSettingVpnError, enum in NMSettingVPN
+NMSettingVpnError, enum in NMSettingVPN
+

+

+

+NMSettingWimax, struct in NMSettingWimax
+

+

+

+NMSettingWimax:mac-address, object property in NMSettingWimax
+

+

+

+NMSettingWimax:network-name, object property in NMSettingWimax
+

+

+

+NMSettingWimaxClass, struct in NMSettingWimax
+

+

+

+NMSettingWimaxError, enum in NMSettingWimax
 

 

 

@@ -1083,7 +1131,7 @@
 

 

 

-NMSettingWiredError, enum in NMSettingWired
+NMSettingWiredError, enum in NMSettingWired
 

 

 

@@ -1143,7 +1191,7 @@
 

 

 

-NMSettingWirelessError, enum in NMSettingWireless
+NMSettingWirelessError, enum in NMSettingWireless
 

 

 

@@ -1167,6 +1215,10 @@
 

 

 

+NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
+

+

+

 NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
 

 

@@ -1183,6 +1235,14 @@
 
 

 

+NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
+

+

+

+NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
+

+

+

 NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
 

 

@@ -1211,7 +1271,7 @@
 
 

 

-NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
+NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
 

 

 

@@ -1255,10 +1315,6 @@
 

 

 

-nm_setting_802_1x_get_ca_cert, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_ca_cert_blob, function in NMSetting8021x
 

 

@@ -1275,10 +1331,6 @@
 
 

 

-nm_setting_802_1x_get_client_cert, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_client_cert_blob, function in NMSetting8021x
 

 

@@ -1307,6 +1359,10 @@
 
 

 

+nm_setting_802_1x_get_password_flags, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 

 

@@ -1327,10 +1383,6 @@
 
 

 

-nm_setting_802_1x_get_phase2_ca_cert, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_phase2_ca_cert_blob, function in NMSetting8021x
 

 

@@ -1347,10 +1399,6 @@
 
 

 

-nm_setting_802_1x_get_phase2_client_cert, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_phase2_client_cert_blob, function in NMSetting8021x
 

 

@@ -1363,10 +1411,6 @@
 
 

 

-nm_setting_802_1x_get_phase2_private_key, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_get_phase2_private_key_blob, function in NMSetting8021x
 

 

@@ -1379,15 +1423,15 @@
 
 

 

-nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_password_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_type, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
 

 

 

@@ -1395,7 +1439,7 @@
 

 

 

-nm_setting_802_1x_get_private_key, function in NMSetting8021x
+nm_setting_802_1x_get_pin_flags, function in NMSetting8021x
 

 

 

@@ -1411,19 +1455,15 @@
 

 

 

-nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_password_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
-

-

-

-nm_setting_802_1x_get_private_key_type, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_psk, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
 

 

 

@@ -1447,6 +1487,10 @@
 

 

 

+NM_SETTING_802_1X_PASSWORD_FLAGS, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, macro in NMSetting8021x
 

 

@@ -1487,10 +1531,18 @@
 
 

 

+NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PIN, macro in NMSetting8021x
 

 

 

+NM_SETTING_802_1X_PIN_FLAGS, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PRIVATE_KEY, macro in NMSetting8021x
 

 

@@ -1499,7 +1551,7 @@
 
 

 

-NM_SETTING_802_1X_PSK, macro in NMSetting8021x
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, macro in NMSetting8021x
 

 

 

@@ -1515,50 +1567,26 @@
 

 

 

-nm_setting_802_1x_set_ca_cert_from_file, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_set_client_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_client_cert_from_file, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_set_phase2_ca_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_ca_cert_from_file, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_set_phase2_client_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_client_cert_from_file, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_set_phase2_private_key, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_private_key_from_file, function in NMSetting8021x
-

-

-

 nm_setting_802_1x_set_private_key, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_private_key_from_file, function in NMSetting8021x
-

-

-

 NM_SETTING_802_1X_SYSTEM_CA_CERTS, macro in NMSetting8021x
 

 

@@ -1623,6 +1651,10 @@
 
 

 

+nm_setting_cdma_get_password_flags, function in NMSettingCdma
+

+

+

 nm_setting_cdma_get_type, function in NMSettingCdma
 

 

@@ -1643,6 +1675,10 @@
 
 

 

+NM_SETTING_CDMA_PASSWORD_FLAGS, macro in NMSettingCdma
+

+

+

 NM_SETTING_CDMA_SETTING_NAME, macro in NMSettingCdma
 

 

@@ -1659,6 +1695,10 @@
 
 

 

+nm_setting_connection_add_permission, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_AUTOCONNECT, macro in NMSettingConnection
 

 

@@ -1683,6 +1723,14 @@
 
 

 

+nm_setting_connection_get_num_permissions, function in NMSettingConnection
+

+

+

+nm_setting_connection_get_permission, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_read_only, function in NMSettingConnection
 

 

@@ -1707,10 +1755,22 @@
 
 

 

+NM_SETTING_CONNECTION_PERMISSIONS, macro in NMSettingConnection
+

+

+

+nm_setting_connection_permissions_user_allowed, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_READ_ONLY, macro in NMSettingConnection
 

 

 

+nm_setting_connection_remove_permission, function in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_SETTING_NAME, macro in NMSettingConnection
 

 

@@ -1751,19 +1811,19 @@
 
 

 

-nm_setting_get_type, function in NMSetting
+nm_setting_get_secret_flags, function in NMSetting
 

 

 

-NM_SETTING_GSM_ALLOWED_BANDS, macro in NMSettingGsm
+nm_setting_get_type, function in NMSetting
 

 

 

-NM_SETTING_GSM_APN, macro in NMSettingGsm
+NM_SETTING_GSM_ALLOWED_BANDS, macro in NMSettingGsm
 

 

 

-NM_SETTING_GSM_BAND, macro in NMSettingGsm
+NM_SETTING_GSM_APN, macro in NMSettingGsm
 

 

 

@@ -1783,10 +1843,6 @@
 

 

 

-nm_setting_gsm_get_band, function in NMSettingGsm
-

-

-

 nm_setting_gsm_get_home_only, function in NMSettingGsm
 

 

@@ -1807,11 +1863,15 @@
 
 

 

+nm_setting_gsm_get_password_flags, function in NMSettingGsm
+

+

+

 nm_setting_gsm_get_pin, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_puk, function in NMSettingGsm
+nm_setting_gsm_get_pin_flags, function in NMSettingGsm
 

 

 

@@ -1847,11 +1907,15 @@
 

 

 

+NM_SETTING_GSM_PASSWORD_FLAGS, macro in NMSettingGsm
+

+

+

 NM_SETTING_GSM_PIN, macro in NMSettingGsm
 

 

 

-NM_SETTING_GSM_PUK, macro in NMSettingGsm
+NM_SETTING_GSM_PIN_FLAGS, macro in NMSettingGsm
 

 

 

@@ -2327,6 +2391,10 @@
 

 

 

+nm_setting_pppoe_get_password_flags, function in NMSettingPPPOE
+

+

+

 nm_setting_pppoe_get_service, function in NMSettingPPPOE
 

 

@@ -2347,6 +2415,10 @@
 
 

 

+NM_SETTING_PPPOE_PASSWORD_FLAGS, macro in NMSettingPPPOE
+

+

+

 NM_SETTING_PPPOE_SERVICE, macro in NMSettingPPPOE
 

 

@@ -2523,6 +2595,10 @@
 
 

 

+NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
+

+

+

 NM_SETTING_SERIAL_BAUD, macro in NMSettingSerial
 

 

@@ -2583,6 +2659,10 @@
 
 

 

+nm_setting_set_secret_flags, function in NMSetting
+

+

+

 nm_setting_to_hash, function in NMSetting
 

 

@@ -2675,6 +2755,42 @@
 
 

 

+NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+

+

+

+nm_setting_wimax_error_quark, function in NMSettingWimax
+

+

+

+nm_setting_wimax_get_mac_address, function in NMSettingWimax
+

+

+

+nm_setting_wimax_get_network_name, function in NMSettingWimax
+

+

+

+nm_setting_wimax_get_type, function in NMSettingWimax
+

+

+

+NM_SETTING_WIMAX_MAC_ADDRESS, macro in NMSettingWimax
+

+

+

+NM_SETTING_WIMAX_NETWORK_NAME, macro in NMSettingWimax
+

+

+

+nm_setting_wimax_new, function in NMSettingWimax
+

+

+

+NM_SETTING_WIMAX_SETTING_NAME, macro in NMSettingWimax
+

+

+

 nm_setting_wired_add_s390_option, function in NMSettingWired
 

 

@@ -2887,6 +3003,14 @@
 
 

 

+NM_SETTING_WIRELESS_MODE_ADHOC, macro in NMSettingWireless
+

+

+

+NM_SETTING_WIRELESS_MODE_INFRA, macro in NMSettingWireless
+

+

+

 NM_SETTING_WIRELESS_MTU, macro in NMSettingWireless
 

 

@@ -2955,6 +3079,10 @@
 
 

 

+nm_setting_wireless_security_get_leap_password_flags, function in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_get_leap_username, function in NMSettingWirelessSecurity
 

 

@@ -2983,6 +3111,10 @@
 
 

 

+nm_setting_wireless_security_get_psk_flags, function in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_get_type, function in NMSettingWirelessSecurity
 

 

@@ -2991,6 +3123,10 @@
 
 

 

+nm_setting_wireless_security_get_wep_key_flags, function in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_get_wep_key_type, function in NMSettingWirelessSecurity
 

 

@@ -3011,6 +3147,10 @@
 
 

 

+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, macro in NMSettingWirelessSecurity
+

+

+

 NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, macro in NMSettingWirelessSecurity
 

 

@@ -3031,6 +3171,10 @@
 
 

 

+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, macro in NMSettingWirelessSecurity
+

+

+

 nm_setting_wireless_security_remove_group, function in NMSettingWirelessSecurity
 

 

@@ -3067,6 +3211,10 @@
 
 

 

+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, macro in NMSettingWirelessSecurity
+

+

+

 NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, macro in NMSettingWirelessSecurity
 

 

@@ -3092,7 +3240,7 @@
 

 
T

 

-NM_TYPE_CONNECTION_ERROR, macro in NMConnection
+NM_TYPE_CONNECTION_ERROR, macro in NMConnection
 

 

 

@@ -3148,6 +3296,10 @@
 

 

 

+NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
+

+

+

 NM_TYPE_SETTING_WIRED_ERROR, macro in NMSettingWired
 

 

@@ -3282,25 +3434,17 @@
 

 
V

 

-VPNIterFunc, user_function in NMSettingVPN
+NMVPNIterFunc, user_function in NMSettingVPN
 

 

 
W

 

-nm_warning, macro in nm-utils
-

-

-

-nm_warning_str, macro in nm-utils
-

-

-

 NMWepKeyType, enum in NMSettingWirelessSecurity
 

 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 545175e7..2800abf2 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -7,8 +7,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -17,16 +17,13 @@
  
 Home
 libnm-util Reference Manual
-Next
+Next
 
-

+

 

-libnm-util API Reference

+libnm-util API Reference

 

 

-NMConnection — Describes a connection to specific network or provider
-

-

 NMSetting — Describes related configuration information
 

 

@@ -78,9 +75,10 @@
 nm-utils — Utility functions
 

 

+<xi:include></xi:include>
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 69dc2827..90ada1bf 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,18 +6,18 @@
 
 
 
-
+
 
 
 
-

+

 

 

 

 

-      for libnm-util 0.8
+      for libnm-util 0.9
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-util/08/.
+      http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

 

 

@@ -26,9 +26,6 @@
 
libnm-util API Reference

 

 

-NMConnection — Describes a connection to specific network or provider
-

-

 NMSetting — Describes related configuration information
 

 

@@ -87,6 +84,6 @@
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index ee50d977..d9981473 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,57 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
+
 
 
 
@@ -69,10 +19,19 @@
 
 
 
+
+
+
+
+
 
 
 
 
+
+
+
+
 
 
 
@@ -94,10 +53,13 @@
 
 
 
+
+
 
 
 
 
+
 
 
 
@@ -117,6 +79,7 @@
 
 
 
+
 
 
 
@@ -127,15 +90,22 @@
 
 
 
+
+
+
+
+
 
 
 
+
 
 
 
 
 
 
+
 
 
 
@@ -186,6 +156,7 @@
 
 
 
+
 
 
 
@@ -207,6 +178,8 @@
 
 
 
+
+
 
 
 
@@ -241,6 +214,7 @@
 
 
 
+
 
 
 
@@ -262,9 +236,12 @@
 
 
 
+
+
 
+
 
-
+
 
 
 
@@ -286,22 +263,28 @@
 
 
 
+
 
 
+
 
 
 
 
+
 
 
 
 
 
 
+
 
 
 
 
+
+
 
 
 
@@ -310,6 +293,7 @@
 
 
 
+
 
 
 
@@ -334,6 +318,7 @@
 
 
 
+
 
 
 
@@ -365,6 +350,7 @@
 
 
 
+
 
 
 
@@ -377,6 +363,7 @@
 
 
 
+
 
 
 
@@ -384,12 +371,15 @@
 
 
 
+
 
 
 
+
 
 
 
+
 
 
 
@@ -402,19 +392,14 @@
 
 
 
+
 
 
 
 
 
+
 
-
-
-
-
-
-
-
 
 
 
@@ -430,22 +415,23 @@
 
 
 
-
-
+
+
 
 
 
-
 
 
 
 
 
+
 
-
+
 
 
 
+
 
 
 
@@ -471,12 +457,20 @@
 
 
 
+
 
 
 
 
 
+
+
+
+
 
+
+
+
 
 
 
@@ -497,12 +491,15 @@
 
 
 
+
 
 
+
 
 
+
 
-
+
 
 
 
@@ -540,35 +537,23 @@
 
 
 
+
 
-
+
 
 
 
 
 
+
 
 
 
 
 
 
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -577,6 +562,7 @@
 
 
 
+
 
 
 
@@ -587,11 +573,16 @@
 
 
 
+
 
 
+
 
 
 
+
+
+
 
 
 
@@ -619,6 +610,7 @@
 
 
 
+
 
 
 
@@ -631,6 +623,7 @@
 
 
 
+
 
 
 
@@ -691,6 +684,9 @@
 
 
 
+
+
+
 
 
 
@@ -716,6 +712,7 @@
 
 
 
+
 
 
 
@@ -728,6 +725,7 @@
 
 
 
+
 
 
 
@@ -782,6 +780,7 @@
 
 
 
+
 
 
 
@@ -852,6 +851,7 @@
 
 
 
+
 
 
 
@@ -864,6 +864,7 @@
 
 
 
+
 
 
 
@@ -871,12 +872,15 @@
 
 
 
+
 
 
+
 
 
 
 
+
 
 
 
@@ -892,7 +896,7 @@
 
 
 
-
+
 
 
 
@@ -914,16 +918,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -954,4 +948,10 @@
 
 
 
+
+
 
+
+
+
+
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index ccf9ab5e..f2650339 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -26,7 +26,7 @@
                   Description
 
 
-

+

 

 

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

-

+

 
Synopsis

 
 #include <nm-utils.h>
 
-#define             nm_print_backtrace
-#define             nm_get_timestamp                    (timestamp)
-#define             nm_info                             (fmt,
-                                                         args...)
-#define             nm_info_str                         (fmt_str,
-                                                         args...)
-#define             nm_debug                            (fmt,
-                                                         args...)
-#define             nm_debug_str                        (fmt_str,
-                                                         args...)
-#define             nm_warning                          (fmt,
-                                                         args...)
-#define             nm_warning_str                      (fmt_str,
-                                                         args...)
-#define             nm_error                            (fmt,
-                                                         args...)
-#define             nm_error_str                        (fmt_str,
-                                                         args...)
 gboolean            nm_utils_init                       (GError **error);
 void                nm_utils_deinit                     (void);
 gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
@@ -67,8 +49,7 @@ const char *        gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
                                                          gboolean ignore_trailing_null);
-char *              nm_utils_ssid_to_utf8               (const char *ssid,
-                                                         guint32 len);
+char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
 void                nm_utils_slist_free                 (GSList *list,
                                                          GDestroyNotify elem_destroy_fn);
@@ -114,216 +95,16 @@ enum                const char *band);
 

 

-

+

 
Description

 

 A collection of utility functions for working SSIDs, IP addresses, WiFi
 access points and devices, among other things.
 

 

-

+

 
Details

-

-
nm_print_backtrace

-
#define             nm_print_backtrace()

-

-Prints a backtrace of the calling process to the logging location.
-

-

-

-

-
nm_get_timestamp()

-
#define             nm_get_timestamp(timestamp)

-

-For debugging only.
-

-

--
-
-
-
-


timestamp :
location in which to place the current timestamp
-

-

-

-

-
nm_info()

-
#define             nm_info(fmt, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt :

-
args... :

-

-

-

-

-
nm_info_str()

-
#define             nm_info_str(fmt_str, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt_str :

-
args... :

-

-

-

-

-
nm_debug()

-
#define             nm_debug(fmt, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt :

-
args... :

-

-

-

-

-
nm_debug_str()

-
#define             nm_debug_str(fmt_str, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt_str :

-
args... :

-

-

-

-

-
nm_warning()

-
#define             nm_warning(fmt, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt :

-
args... :

-

-

-

-

-
nm_warning_str()

-
#define             nm_warning_str(fmt_str, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt_str :

-
args... :

-

-

-

-

-
nm_error()

-
#define             nm_error(fmt, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt :

-
args... :

-

-

-

-

-
nm_error_str()

-
#define             nm_error_str(fmt_str, args...)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


fmt_str :

-
args... :

-

-

-

-

+

 
nm_utils_init ()

 
gboolean            nm_utils_init                       (GError **error);

 

@@ -342,14 +123,13 @@ libnm-util can also be done.  This function can be called more than once.
 
 
 
Returns :

- TRUE if the initialization was successful, FALSE on failure.
-
+TRUE if the initialization was successful, FALSE on failure.
 
 
 

 

 

-

+

 
nm_utils_deinit ()

 
void                nm_utils_deinit                     (void);

 

@@ -360,7 +140,7 @@ called again.
 

 

 

-

+

 
nm_utils_is_empty_ssid ()

 
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
                                                          int len);

@@ -374,8 +154,7 @@ number of known SSID-cloaking methods.
 
 
 
ssid :

-pointer to a buffer containing the SSID data
-
+pointer to a buffer containing the SSID data
 
 
 
len :

@@ -384,14 +163,13 @@ number of known SSID-cloaking methods.
 
 
 
Returns :

- TRUE if the SSID is "empty", FALSE if it is not
-
+TRUE if the SSID is "empty", FALSE if it is not
 
 
 

 

 

-

+

 
nm_utils_escape_ssid ()

 
const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);

@@ -406,8 +184,7 @@ be used for display of SSIDs.
 
 
 
ssid :

-pointer to a buffer containing the SSID data
-
+pointer to a buffer containing the SSID data
 
 
 
len :

@@ -416,15 +193,14 @@ be used for display of SSIDs.
 
 
 
Returns :

- pointer to the escaped SSID, which uses an internal static buffer
-and will be overwritten by subsequent calls to this function
-
+pointer to the escaped SSID, which uses an internal static buffer
+and will be overwritten by subsequent calls to this function
 
 
 

 

 

-

+

 
nm_utils_same_ssid ()

 
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
                                                          const GByteArray *ssid2,
@@ -442,32 +218,27 @@ NULLs, even though that is functionally pointless.
 
 
 
ssid1 :

-first SSID data to compare
-
+first SSID data to compare
 
 
 
ssid2 :

-second SSID data to compare
-
+second SSID data to compare
 
 
 
ignore_trailing_null :

-TRUE to ignore one trailing NULL byte
-
+TRUE to ignore one trailing NULL byte
 
 
 
Returns :

- TRUE if the SSIDs are the same, FALSE if they are not
-
+TRUE if the SSIDs are the same, FALSE if they are not
 
 
 

 

 

-

+

 
nm_utils_ssid_to_utf8 ()

-
char *              nm_utils_ssid_to_utf8               (const char *ssid,
-                                                         guint32 len);

+
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

 

 WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
@@ -500,26 +271,20 @@ _only_.
 
 
 
ssid :

-pointer to a buffer containing the SSID data
-
-
-
-
len :

-length of the SSID data in ssid
-
+a byte array containing the SSID data
 
 
 
Returns :

- an allocated string containing a UTF-8 representation of the
-SSID, which must be freed by the caller using g_free().  Returns NULL
-on errors.
+an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. [transfer full]
 
 
 
 

 

 

-

+

 
nm_utils_gvalue_hash_dup ()

 
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

 

@@ -530,20 +295,19 @@ Utility function to duplicate a hash table of GValues.
 
 
 
hash :

-a GHashTable mapping string:GValue
-
+a GHashTable mapping string:GValue
 
 
 
Returns :

- a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy()
+a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
 
 
 
 

 

 

-

+

 
nm_utils_slist_free ()

 
void                nm_utils_slist_free                 (GSList *list,
                                                          GDestroyNotify elem_destroy_fn);

@@ -567,7 +331,7 @@ Utility function to free a 
+

 
enum NMUtilsSecurityType

 
typedef enum {
 	NMU_SEC_INVALID = 0,
@@ -585,7 +349,7 @@ Utility function to free a 
+

 
nm_utils_security_valid ()

 
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
                                                          guint32 wifi_caps,
@@ -616,13 +380,11 @@ e.g. NMU_SEC_STATIC_WEP
 
 
 
have_ap :

-whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
-
+whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
 
 
 
adhoc :

-whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
-
+whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
 
 
 
ap_flags :

@@ -632,32 +394,29 @@ e.g. NMU_SEC_STATIC_WEP
 
 
ap_wpa :

 bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
-
+e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
 
 
 
ap_rsn :

 bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
-
+e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
 
 
 
Returns :

- TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are not
-
+TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type, FALSE if they are not
 
 
 

 

 

-

+

 
nm_utils_ip4_addresses_from_gvalue ()

 
GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);

 

 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of NMIP4Address objects.  The specific format of
+and prefix) into a GSList of NMIP4Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GArray may be
 extended in the future.
 

@@ -666,24 +425,23 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GArrays of guint32s
-
+gvalue containing a GPtrArray of GArrays of guint32s
 
 
 
Returns :

- a newly allocated GSList of NMIP4Address objects
+a newly allocated GSList of NMIP4Address objects. [transfer full][element-type NetworkManager.IP4Address]
 
 
 
 

 

 

-

+

 
nm_utils_ip4_addresses_to_gvalue ()

 
void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP4Address objects into a
+Utility function to convert a GSList of NMIP4Address objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
@@ -694,27 +452,25 @@ extended in the future.
 
 
 
list :

-a list of NMIP4Address objects
-
+a list of NMIP4Address objects
 
 
 
value :

 a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
-
+g_value_unset().
 
 
 

 

 

-

+

 
nm_utils_ip4_routes_from_gvalue ()

 
GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);

 

 Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of NMIP4Route objects.  The specific
+prefix, and metric) into a GSList of NMIP4Route objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.
 

@@ -723,24 +479,23 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GArrays of guint32s
-
+gvalue containing a GPtrArray of GArrays of guint32s
 
 
 
Returns :

- a newly allocated GSList of NMIP4Route objects
+a newly allocated GSList of NMIP4Route objects. [transfer full][element-type NetworkManager.IP4Route]
 
 
 
 

 

 

-

+

 
nm_utils_ip4_routes_to_gvalue ()

 
void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP4Route objects into a
+Utility function to convert a GSList of NMIP4Route objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
@@ -751,21 +506,19 @@ be extended in the future.
 
 
 
list :

-a list of NMIP4Route objects
-
+a list of NMIP4Route objects
 
 
 
value :

 a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
-
+g_value_unset().
 
 
 

 

 

-

+

 
nm_utils_ip4_netmask_to_prefix ()

 
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

 

@@ -773,19 +526,17 @@ which should be unset by the caller (when no longer needed) with
 
-
+
-
+

 

 
netmask :
an IPv4 netmask in network byte order
-an IPv4 netmask in network byte order
 

 

 
Returns :
 the CIDR prefix represented by the netmask
-the CIDR prefix represented by the netmask
 

 
 

 

 

-

+

 
nm_utils_ip4_prefix_to_netmask ()

 
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

 

@@ -793,19 +544,17 @@ which should be unset by the caller (when no longer needed) with
 
-
+
-
+

 

 
prefix :
a CIDR prefix
-a CIDR prefix
 

 

 
Returns :
 the netmask represented by the prefix
-the netmask represented by the prefix
 

 
 

 

 

-

+

 
nm_utils_ip4_get_default_prefix ()

 
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

 

@@ -819,25 +568,23 @@ falls in the predefined classes.
 
 
 
ip :

-an IPv4 address (in network byte order)
-
+an IPv4 address (in network byte order)
 
 
 
Returns :

- the default class prefix for the given IP
-
+the default class prefix for the given IP
 
 
 

 

 

-

+

 
nm_utils_ip6_addresses_from_gvalue ()

 
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

 

 Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
+prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GValueArray may be
 extended in the future.
 

@@ -846,24 +593,23 @@ extended in the future.
 
 
 
value :

-gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
-
+gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 
 
 
Returns :

- a newly allocated GSList of NMIP6Address objects
+a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
 
 
 
 

 

 

-

+

 
nm_utils_ip6_addresses_to_gvalue ()

 
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP6Address objects into a
+Utility function to convert a GSList of NMIP6Address objects into a
 GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
@@ -874,28 +620,26 @@ future.
 
 
 
list :

-a list of NMIP6Address objects
-
+a list of NMIP6Address objects
 
 
 
value :

 a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
-
+g_value_unset().
 
 
 

 

 

-

+

 
nm_utils_ip6_routes_from_gvalue ()

 
GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);

 

 Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
 (GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of NMIP6Route objects.  The specific format of this serialization
+into a GSList of NMIP6Route objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
 

 

@@ -904,24 +648,23 @@ is not guaranteed to be stable and may be extended in the future.
 
+(GArray of guchars), and guint32
-

 
value :

 gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
-(GArray of guchars), and guint32
-
 

 

 
Returns :
 a newly allocated GSList of NMIP6Route objects
+a newly allocated GSList of NMIP6Route objects. [transfer full][element-type NetworkManager.IP6Route]
 
 

 
 

 

 

-

+

 
nm_utils_ip6_routes_to_gvalue ()

 
void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
+Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
 GValueArrays of (GArray or guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not 
@@ -932,80 +675,48 @@ guaranteed to be stable and may be extended in the future.
 
 
 
list :

-a list of NMIP6Route objects
-
+a list of NMIP6Route objects
 
 
 
value :

 a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
-
+g_value_unset().
 
 
 

 

 

-

+

 
nm_utils_ip6_dns_from_gvalue ()

 
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


value :

-
Returns :

-

 

 

-

+

 
nm_utils_ip6_dns_to_gvalue ()

 
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
                                                          GValue *value);

 

 

-

--
-
-
-
-
-
-
-
-
-
-


list :

-
value :

-

 

 

-

+

 
nm_utils_uuid_generate ()

 
char *              nm_utils_uuid_generate              (void);

 

-

 
 

 
Returns :
 a newly allocated UUID suitable for use as the NMSettingConnection
+a newly allocated UUID suitable for use as the NMSettingConnection
 object's "id": property.  Should be freed with g_free()
 
 

 

 

 

-

+

 
nm_utils_uuid_generate_from_string ()

 
char *              nm_utils_uuid_generate_from_string  (const char *s);

 

@@ -1016,20 +727,18 @@ For a given s, this function will always
 
 
 
s :

-a string to use as the seed for the UUID
-
+a string to use as the seed for the UUID
 
 
 
Returns :

- a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property
-
+a newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property
 
 
 

 

 

-

+

 
nm_utils_rsa_key_encrypt ()

 
GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
@@ -1045,36 +754,34 @@ suitable for writing to a file.
 
 
 
data :

-RSA private key data to be encrypted
-
+RSA private key data to be encrypted
 
 
 
in_password :

-existing password to use, if any
+existing password to use, if any. [allow-none]
 
 
 
 
out_password :

 if in_password was NULL, a random password will be generated
- and returned in this argument
+and returned in this argument. [out][allow-none]
 
 
 
 
error :

-detailed error information on return, if an error occurred
-
+detailed error information on return, if an error occurred
 
 
 
Returns :

- on success, PEM-formatted data suitable for writing to a PEM-formatted
-certificate/private key file.
+on success, PEM-formatted data suitable for writing to a PEM-formatted
+certificate/private key file. [transfer full]
 
 
 
 

 

 

-

+

 
nm_utils_wifi_freq_to_channel ()

 
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

 

@@ -1085,19 +792,17 @@ Utility function to translate a WiFi frequency to its corresponding channel.
 
 
 
freq :

-frequency
-
+frequency
 
 
 
Returns :

- the channel represented by the frequency or 0
-
+the channel represented by the frequency or 0
 
 
 

 

 

-

+

 
nm_utils_wifi_channel_to_freq ()

 
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
                                                          const char *band);

@@ -1109,26 +814,23 @@ Utility function to translate a WiFi channel to its corresponding frequency.
 
 
 
channel :

-channel
-
+channel
 
 
 
band :

-frequency band for wireless ("a" or "bg")
-
+frequency band for wireless ("a" or "bg")
 
 
 
Returns :

- the frequency represented by the channel of the band,
-         or -1 when the freq is invalid, or 0 when the band
-         is invalid
-
+the frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid
 
 
 

 

 

-

+

 
nm_utils_wifi_find_next_channel ()

 
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
                                                          int direction,
@@ -1141,29 +843,25 @@ Utility function to find out next/previous WiFi channel for a channel.
 
 
 
channel :

-current channel
-
+current channel
 
 
 
direction :

-whether going downward (0 or less) or upward (1 or more)
-
+whether going downward (0 or less) or upward (1 or more)
 
 
 
band :

-frequency band for wireless ("a" or "bg")
-
+frequency band for wireless ("a" or "bg")
 
 
 
Returns :

- the next channel in the specified direction or 0
-
+the next channel in the specified direction or 0
 
 
 

 

 

-

+

 
nm_utils_wifi_is_channel_valid ()

 
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);

@@ -1175,18 +873,15 @@ Utility function to verify WiFi channel validity.
 
 
 
channel :

-channel
-
+channel
 
 
 
band :

-frequency band for wireless ("a" or "bg")
-
+frequency band for wireless ("a" or "bg")
 
 
 
Returns :

- TRUE or FALSE
-
+TRUE or FALSE
 
 
 

@@ -1195,6 +890,6 @@ Utility function to verify WiFi channel validity.
 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
index 91d080b9..3fa339f1 100644
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ b/docs/libnm-util/html/libnm-util.devhelp
@@ -3,7 +3,6 @@
 
   
     
-      
       
       
       
@@ -27,43 +26,6 @@
     
   
   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -73,10 +35,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
@@ -91,6 +55,8 @@
     
     
     
+    
+    
     
     
     
@@ -103,6 +69,7 @@
     
     
     
+    
     
     
     
@@ -113,8 +80,14 @@
     
     
     
+    
+    
+    
+    
+    
     
     
+    
     
     
     
@@ -179,6 +152,8 @@
     
     
     
+    
+    
     
     
     
@@ -227,9 +202,12 @@
     
     
     
+    
+    
     
+    
     
-    
+    
     
     
     
@@ -251,21 +229,27 @@
     
     
     
+    
     
     
+    
     
     
     
     
+    
     
     
     
     
     
+    
     
     
     
     
+    
+    
     
     
     
@@ -321,6 +305,7 @@
     
     
     
+    
     
     
     
@@ -328,8 +313,10 @@
     
     
     
+    
     
     
+    
     
     
     
@@ -339,19 +326,14 @@
     
     
     
+    
     
     
     
     
     
+    
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -367,18 +349,18 @@
     
     
     
-    
-    
+    
+    
     
     
-    
     
     
     
     
     
+    
     
-    
+    
     
     
     
@@ -420,12 +402,15 @@
     
     
     
+    
     
     
+    
     
     
+    
     
-    
+    
     
     
     
@@ -463,35 +448,23 @@
     
     
     
+    
     
-    
+    
     
     
     
     
     
+    
     
     
     
     
     
     
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -499,6 +472,7 @@
     
     
     
+    
     
     
     
@@ -509,8 +483,10 @@
     
     
     
+    
     
     
+    
     
     
     
@@ -535,6 +511,7 @@
     
     
     
+    
     
     
     
@@ -547,6 +524,7 @@
     
     
     
+    
     
     
     
@@ -625,6 +603,7 @@
     
     
     
+    
     
     
     
@@ -637,6 +616,7 @@
     
     
     
+    
     
     
     
@@ -759,6 +739,7 @@
     
     
     
+    
     
     
     
@@ -766,7 +747,9 @@
     
     
     
+    
     
+    
     
     
     
@@ -780,7 +763,7 @@
     
     
     
-    
+    
     
     
     
@@ -797,16 +780,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 3f68f0ec..9cb466dd 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -3,7 +3,6 @@
 
   
     
-      
       
       
       
@@ -27,43 +26,6 @@
     
   
   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -73,10 +35,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
@@ -91,6 +55,8 @@
     
     
     
+    
+    
     
     
     
@@ -103,6 +69,7 @@
     
     
     
+    
     
     
     
@@ -113,8 +80,14 @@
     
     
     
+    
+    
+    
+    
+    
     
     
+    
     
     
     
@@ -179,6 +152,8 @@
     
     
     
+    
+    
     
     
     
@@ -227,9 +202,12 @@
     
     
     
+    
+    
     
+    
     
-    
+    
     
     
     
@@ -251,21 +229,27 @@
     
     
     
+    
     
     
+    
     
     
     
     
+    
     
     
     
     
     
+    
     
     
     
     
+    
+    
     
     
     
@@ -321,6 +305,7 @@
     
     
     
+    
     
     
     
@@ -328,8 +313,10 @@
     
     
     
+    
     
     
+    
     
     
     
@@ -339,19 +326,14 @@
     
     
     
+    
     
     
     
     
     
+    
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -367,18 +349,18 @@
     
     
     
-    
-    
+    
+    
     
     
-    
     
     
     
     
     
+    
     
-    
+    
     
     
     
@@ -420,12 +402,15 @@
     
     
     
+    
     
     
+    
     
     
+    
     
-    
+    
     
     
     
@@ -463,35 +448,23 @@
     
     
     
+    
     
-    
+    
     
     
     
     
     
+    
     
     
     
     
     
     
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -499,6 +472,7 @@
     
     
     
+    
     
     
     
@@ -509,8 +483,10 @@
     
     
     
+    
     
     
+    
     
     
     
@@ -535,6 +511,7 @@
     
     
     
+    
     
     
     
@@ -547,6 +524,7 @@
     
     
     
+    
     
     
     
@@ -625,6 +603,7 @@
     
     
     
+    
     
     
     
@@ -637,6 +616,7 @@
     
     
     
+    
     
     
     
@@ -759,6 +739,7 @@
     
     
     
+    
     
     
     
@@ -766,7 +747,9 @@
     
     
     
+    
     
+    
     
     
     
@@ -780,7 +763,7 @@
     
     
     
-    
+    
     
     
     
@@ -797,16 +780,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -837,15 +810,17 @@
     
     
     
-    
-    
-    
-    
-    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -857,5 +832,12 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 11904962..bbe2a6d2 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -19,12 +19,12 @@
 libnm-util Reference Manual
 Next
 
-

+

 

 Object Hierarchy

 
     GObject
-        NMConnection
+        NMConnection
         NMSetting
             NMSetting8021x
             NMSettingBluetooth
@@ -38,13 +38,38 @@
             NMSettingPPPOE
             NMSettingSerial
             NMSettingVPN
+            NMSettingWimax
             NMSettingWired
             NMSettingWireless
             NMSettingWirelessSecurity
+    GEnum
+        NMConnectionError
+        NMSetting8021xError
+        NMSettingBluetoothError
+        NMSettingCdmaError
+        NMSettingConnectionError
+        NMSettingError
+        NMSettingGsmError
+        NMSettingIP4ConfigError
+        NMSettingIP6ConfigError
+        NMSettingOlpcMeshError
+        NMSettingPPPError
+        NMSettingPPPOEError
+        NMSettingSerialError
+        NMSettingVpnError
+        NMSettingWimaxError
+        NMSettingWiredError
+        NMSettingWirelessError
+        NMSettingWirelessSecurityError
+    GBoxed
+        NMIP4Address
+        NMIP4Route
+        NMIP6Address
+        NMIP6Route
 

 

 

 

-          Generated by GTK-Doc V1.15

+          Generated by GTK-Doc V1.17

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index d544a2c2..d6f6c26e 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -32,8 +32,9 @@
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
   {
+    display: inline-block;
     position: relative;
-    padding-top:4.5em;
+    top:-5em;
   }
   /* this seems to be a bug in the xsl style sheets when generating indexes */
   div.index div.index
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index 78b931d8..c80565ab 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -8,9 +8,9 @@
   
     libnm-util Reference Manual
     
-      for libnm-util 0.8
+      for libnm-util 0.9
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-util/08/.
+      http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     
   
 
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 38eef9cb..1df4b49b 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1,3 +1,49 @@
+

+nm-setting-gsm
+NMSettingGsm
+NM_SETTING_GSM_SETTING_NAME
+NMSettingGsmError
+NM_TYPE_SETTING_GSM_ERROR
+NM_SETTING_GSM_ERROR
+nm_setting_gsm_error_quark
+NM_SETTING_GSM_NUMBER
+NM_SETTING_GSM_USERNAME
+NM_SETTING_GSM_PASSWORD
+NM_SETTING_GSM_PASSWORD_FLAGS
+NM_SETTING_GSM_APN
+NM_SETTING_GSM_NETWORK_ID
+NM_SETTING_GSM_NETWORK_TYPE
+NM_SETTING_GSM_ALLOWED_BANDS
+NM_SETTING_GSM_PIN
+NM_SETTING_GSM_PIN_FLAGS
+NM_SETTING_GSM_HOME_ONLY
+NMSettingGsmNetworkType
+NMSettingGsmNetworkBand
+NMSettingGsm
+NMSettingGsmClass
+nm_setting_gsm_get_type
+nm_setting_gsm_new
+nm_setting_gsm_get_number
+nm_setting_gsm_get_username
+nm_setting_gsm_get_password
+nm_setting_gsm_get_apn
+nm_setting_gsm_get_network_id
+nm_setting_gsm_get_network_type
+nm_setting_gsm_get_allowed_bands
+nm_setting_gsm_get_pin
+nm_setting_gsm_get_home_only
+nm_setting_gsm_get_pin_flags
+nm_setting_gsm_get_password_flags
+
+NM_SETTING_GSM
+NM_IS_SETTING_GSM
+NM_TYPE_SETTING_GSM
+nm_setting_gsm_error_get_type
+NM_SETTING_GSM_CLASS
+NM_IS_SETTING_GSM_CLASS
+NM_SETTING_GSM_GET_CLASS
+

+
 

 nm-setting-8021x
 NMSetting8021x
@@ -23,12 +69,15 @@ NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 NM_SETTING_802_1X_PASSWORD
+NM_SETTING_802_1X_PASSWORD_FLAGS
 NM_SETTING_802_1X_PRIVATE_KEY
 NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PIN
-NM_SETTING_802_1X_PSK
+NM_SETTING_802_1X_PIN_FLAGS
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
 NMSetting8021x
 NMSetting8021xClass
@@ -66,35 +115,23 @@ nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
 nm_setting_802_1x_set_phase2_client_cert
 nm_setting_802_1x_get_password
+nm_setting_802_1x_get_password_flags
 nm_setting_802_1x_get_pin
-nm_setting_802_1x_get_psk
+nm_setting_802_1x_get_pin_flags
 nm_setting_802_1x_get_private_key_scheme
 nm_setting_802_1x_get_private_key_blob
 nm_setting_802_1x_get_private_key_path
 nm_setting_802_1x_set_private_key
 nm_setting_802_1x_get_private_key_password
+nm_setting_802_1x_get_private_key_password_flags
 nm_setting_802_1x_get_private_key_format
 nm_setting_802_1x_get_phase2_private_key_scheme
 nm_setting_802_1x_get_phase2_private_key_blob
 nm_setting_802_1x_get_phase2_private_key_path
 nm_setting_802_1x_set_phase2_private_key
 nm_setting_802_1x_get_phase2_private_key_password
+nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
-NMSetting8021xCKType
-nm_setting_802_1x_get_ca_cert
-nm_setting_802_1x_set_ca_cert_from_file
-nm_setting_802_1x_get_client_cert
-nm_setting_802_1x_set_client_cert_from_file
-nm_setting_802_1x_get_phase2_ca_cert
-nm_setting_802_1x_set_phase2_ca_cert_from_file
-nm_setting_802_1x_get_phase2_client_cert
-nm_setting_802_1x_set_phase2_client_cert_from_file
-nm_setting_802_1x_get_private_key
-nm_setting_802_1x_set_private_key_from_file
-nm_setting_802_1x_get_private_key_type
-nm_setting_802_1x_get_phase2_private_key
-nm_setting_802_1x_set_phase2_private_key_from_file
-nm_setting_802_1x_get_phase2_private_key_type
 
 NM_SETTING_802_1X
 NM_IS_SETTING_802_1X
@@ -106,90 +143,89 @@ NM_SETTING_802_1X_GET_CLASS
 

 
 

-nm-connection
-NMConnection
-NMConnectionScope
-NMConnectionError
-NM_TYPE_CONNECTION_ERROR
-NM_CONNECTION_ERROR
-nm_connection_error_quark
-NM_CONNECTION_SCOPE
-NM_CONNECTION_PATH
-NMConnection
-NMConnectionClass
-nm_connection_get_type
-nm_connection_new
-nm_connection_new_from_hash
-nm_connection_duplicate
-nm_connection_add_setting
-nm_connection_remove_setting
-nm_connection_get_setting
-nm_connection_get_setting_by_name
-nm_connection_replace_settings
-nm_connection_compare
-nm_connection_diff
-nm_connection_verify
-nm_connection_need_secrets
-nm_connection_clear_secrets
-nm_connection_update_secrets
-nm_connection_set_scope
-nm_connection_get_scope
-nm_connection_set_path
-nm_connection_get_path
-nm_connection_for_each_setting_value
-nm_connection_to_hash
-nm_connection_dump
-nm_connection_create_setting
-nm_connection_lookup_setting_type
-nm_connection_lookup_setting_type_by_quark
+nm-setting-bluetooth
+NMSettingBluetooth
+NM_SETTING_BLUETOOTH_SETTING_NAME
+NMSettingBluetoothError
+NM_TYPE_SETTING_BLUETOOTH_ERROR
+NM_SETTING_BLUETOOTH_ERROR
+nm_setting_bluetooth_error_quark
+NM_SETTING_BLUETOOTH_BDADDR
+NM_SETTING_BLUETOOTH_TYPE
+NM_SETTING_BLUETOOTH_TYPE_DUN
+NM_SETTING_BLUETOOTH_TYPE_PANU
+NMSettingBluetooth
+NMSettingBluetoothClass
+nm_setting_bluetooth_get_type
+nm_setting_bluetooth_new
+nm_setting_bluetooth_get_bdaddr
+nm_setting_bluetooth_get_connection_type
 
-NM_CONNECTION
-NM_IS_CONNECTION
-NM_TYPE_CONNECTION
-nm_connection_error_get_type
-NM_CONNECTION_CLASS
-NM_IS_CONNECTION_CLASS
-NM_CONNECTION_GET_CLASS
+NM_SETTING_BLUETOOTH
+NM_IS_SETTING_BLUETOOTH
+NM_TYPE_SETTING_BLUETOOTH
+nm_setting_bluetooth_error_get_type
+NM_SETTING_BLUETOOTH_CLASS
+NM_IS_SETTING_BLUETOOTH_CLASS
+NM_SETTING_BLUETOOTH_GET_CLASS
 

 
 

-nm-setting
-NMSetting
-NMSettingError
-NM_TYPE_SETTING_ERROR
-NM_SETTING_ERROR
-nm_setting_error_quark
-NM_SETTING_PARAM_SERIALIZE
-NM_SETTING_PARAM_REQUIRED
-NM_SETTING_PARAM_SECRET
-NM_SETTING_PARAM_FUZZY_IGNORE
-NM_SETTING_NAME
-NMSetting
-NMSettingClass
-NMSettingValueIterFn
-nm_setting_get_type
-nm_setting_to_hash
-nm_setting_new_from_hash
-nm_setting_duplicate
-nm_setting_get_name
-nm_setting_verify
-NMSettingCompareFlags
-nm_setting_compare
-NMSettingDiffResult
-nm_setting_diff
-nm_setting_enumerate_values
-nm_setting_to_string
-nm_setting_clear_secrets
-nm_setting_need_secrets
-nm_setting_update_secrets
+nm-setting-olpc-mesh
+NMSettingOlpcMesh
+NM_SETTING_OLPC_MESH_SETTING_NAME
+NMSettingOlpcMeshError
+NM_TYPE_SETTING_OLPC_MESH_ERROR
+NM_SETTING_OLPC_MESH_ERROR
+nm_setting_olpc_mesh_error_quark
+NM_SETTING_OLPC_MESH_SSID
+NM_SETTING_OLPC_MESH_CHANNEL
+NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+NMSettingOlpcMesh
+NMSettingOlpcMeshClass
+nm_setting_olpc_mesh_get_type
+nm_setting_olpc_mesh_new
+nm_setting_olpc_mesh_get_ssid
+nm_setting_olpc_mesh_get_channel
+nm_setting_olpc_mesh_get_dhcp_anycast_address
 
-NM_SETTING
-NM_IS_SETTING
-NM_TYPE_SETTING
-nm_setting_error_get_type
-NM_SETTING_CLASS
-NM_IS_SETTING_CLASS
-NM_SETTING_GET_CLASS
+NM_SETTING_OLPC_MESH
+NM_IS_SETTING_OLPC_MESH
+NM_TYPE_SETTING_OLPC_MESH
+nm_setting_olpc_mesh_error_get_type
+NM_SETTING_OLPC_MESH_CLASS
+NM_IS_SETTING_OLPC_MESH_CLASS
+NM_SETTING_OLPC_MESH_GET_CLASS
+

+
+

+nm-setting-cdma
+NMSettingCdma
+NM_SETTING_CDMA_SETTING_NAME
+NMSettingCdmaError
+NM_TYPE_SETTING_CDMA_ERROR
+NM_SETTING_CDMA_ERROR
+nm_setting_cdma_error_quark
+NM_SETTING_CDMA_NUMBER
+NM_SETTING_CDMA_USERNAME
+NM_SETTING_CDMA_PASSWORD
+NM_SETTING_CDMA_PASSWORD_FLAGS
+NMSettingCdma
+NMSettingCdmaClass
+nm_setting_cdma_get_type
+nm_setting_cdma_new
+nm_setting_cdma_get_number
+nm_setting_cdma_get_username
+nm_setting_cdma_get_password
+nm_setting_cdma_get_password_flags
+
+NM_SETTING_CDMA
+NM_IS_SETTING_CDMA
+NM_TYPE_SETTING_CDMA
+nm_setting_cdma_error_get_type
+NM_SETTING_CDMA_CLASS
+NM_IS_SETTING_CDMA_CLASS
+NM_SETTING_CDMA_GET_CLASS
 

 
 

@@ -224,308 +260,6 @@ NM_IS_SETTING_SERIAL_CLASS
 NM_SETTING_SERIAL_GET_CLASS
 

 
-

-nm-setting-ppp
-NMSettingPPP
-NM_SETTING_PPP_SETTING_NAME
-NMSettingPPPError
-NM_TYPE_SETTING_PPP_ERROR
-NM_SETTING_PPP_ERROR
-nm_setting_ppp_error_quark
-NM_SETTING_PPP_NOAUTH
-NM_SETTING_PPP_REFUSE_EAP
-NM_SETTING_PPP_REFUSE_PAP
-NM_SETTING_PPP_REFUSE_CHAP
-NM_SETTING_PPP_REFUSE_MSCHAP
-NM_SETTING_PPP_REFUSE_MSCHAPV2
-NM_SETTING_PPP_NOBSDCOMP
-NM_SETTING_PPP_NODEFLATE
-NM_SETTING_PPP_NO_VJ_COMP
-NM_SETTING_PPP_REQUIRE_MPPE
-NM_SETTING_PPP_REQUIRE_MPPE_128
-NM_SETTING_PPP_MPPE_STATEFUL
-NM_SETTING_PPP_CRTSCTS
-NM_SETTING_PPP_BAUD
-NM_SETTING_PPP_MRU
-NM_SETTING_PPP_MTU
-NM_SETTING_PPP_LCP_ECHO_FAILURE
-NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NMSettingPPP
-NMSettingPPPClass
-nm_setting_ppp_get_type
-nm_setting_ppp_new
-nm_setting_ppp_get_noauth
-nm_setting_ppp_get_refuse_eap
-nm_setting_ppp_get_refuse_pap
-nm_setting_ppp_get_refuse_chap
-nm_setting_ppp_get_refuse_mschap
-nm_setting_ppp_get_refuse_mschapv2
-nm_setting_ppp_get_nobsdcomp
-nm_setting_ppp_get_nodeflate
-nm_setting_ppp_get_no_vj_comp
-nm_setting_ppp_get_require_mppe
-nm_setting_ppp_get_require_mppe_128
-nm_setting_ppp_get_mppe_stateful
-nm_setting_ppp_get_crtscts
-nm_setting_ppp_get_baud
-nm_setting_ppp_get_mru
-nm_setting_ppp_get_mtu
-nm_setting_ppp_get_lcp_echo_failure
-nm_setting_ppp_get_lcp_echo_interval
-
-NM_SETTING_PPP
-NM_IS_SETTING_PPP
-NM_TYPE_SETTING_PPP
-nm_setting_ppp_error_get_type
-NM_SETTING_PPP_CLASS
-NM_IS_SETTING_PPP_CLASS
-NM_SETTING_PPP_GET_CLASS
-

-
-

-nm-setting-olpc-mesh
-NMSettingOlpcMesh
-NM_SETTING_OLPC_MESH_SETTING_NAME
-NMSettingOlpcMeshError
-NM_TYPE_SETTING_OLPC_MESH_ERROR
-NM_SETTING_OLPC_MESH_ERROR
-nm_setting_olpc_mesh_error_quark
-NM_SETTING_OLPC_MESH_SSID
-NM_SETTING_OLPC_MESH_CHANNEL
-NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-NMSettingOlpcMesh
-NMSettingOlpcMeshClass
-nm_setting_olpc_mesh_get_type
-nm_setting_olpc_mesh_new
-nm_setting_olpc_mesh_get_ssid
-nm_setting_olpc_mesh_get_channel
-nm_setting_olpc_mesh_get_dhcp_anycast_address
-
-NM_SETTING_OLPC_MESH
-NM_IS_SETTING_OLPC_MESH
-NM_TYPE_SETTING_OLPC_MESH
-nm_setting_olpc_mesh_error_get_type
-NM_SETTING_OLPC_MESH_CLASS
-NM_IS_SETTING_OLPC_MESH_CLASS
-NM_SETTING_OLPC_MESH_GET_CLASS
-

-
-

-nm-setting-wired
-NMSettingWired
-NM_SETTING_WIRED_SETTING_NAME
-NMSettingWiredError
-NM_TYPE_SETTING_WIRED_ERROR
-NM_SETTING_WIRED_ERROR
-nm_setting_wired_error_quark
-NM_SETTING_WIRED_PORT
-NM_SETTING_WIRED_SPEED
-NM_SETTING_WIRED_DUPLEX
-NM_SETTING_WIRED_AUTO_NEGOTIATE
-NM_SETTING_WIRED_MAC_ADDRESS
-NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-NM_SETTING_WIRED_MTU
-NM_SETTING_WIRED_S390_SUBCHANNELS
-NM_SETTING_WIRED_S390_NETTYPE
-NM_SETTING_WIRED_S390_OPTIONS
-NMSettingWired
-NMSettingWiredClass
-nm_setting_wired_get_type
-nm_setting_wired_new
-nm_setting_wired_get_port
-nm_setting_wired_get_speed
-nm_setting_wired_get_duplex
-nm_setting_wired_get_auto_negotiate
-nm_setting_wired_get_mac_address
-nm_setting_wired_get_cloned_mac_address
-nm_setting_wired_get_mtu
-nm_setting_wired_get_s390_subchannels
-nm_setting_wired_get_s390_nettype
-nm_setting_wired_get_num_s390_options
-nm_setting_wired_get_s390_option
-nm_setting_wired_get_s390_option_by_key
-nm_setting_wired_add_s390_option
-nm_setting_wired_remove_s390_option
-
-NM_SETTING_WIRED
-NM_IS_SETTING_WIRED
-NM_TYPE_SETTING_WIRED
-nm_setting_wired_error_get_type
-NM_SETTING_WIRED_CLASS
-NM_IS_SETTING_WIRED_CLASS
-NM_SETTING_WIRED_GET_CLASS
-

-
-

-nm-setting-wireless
-NMSettingWireless
-NM_SETTING_WIRELESS_SETTING_NAME
-NMSettingWirelessError
-NM_TYPE_SETTING_WIRELESS_ERROR
-NM_SETTING_WIRELESS_ERROR
-nm_setting_wireless_error_quark
-NM_SETTING_WIRELESS_SSID
-NM_SETTING_WIRELESS_MODE
-NM_SETTING_WIRELESS_BAND
-NM_SETTING_WIRELESS_CHANNEL
-NM_SETTING_WIRELESS_BSSID
-NM_SETTING_WIRELESS_RATE
-NM_SETTING_WIRELESS_TX_POWER
-NM_SETTING_WIRELESS_MAC_ADDRESS
-NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-NM_SETTING_WIRELESS_MTU
-NM_SETTING_WIRELESS_SEEN_BSSIDS
-NM_SETTING_WIRELESS_SEC
-NMSettingWireless
-NMSettingWirelessClass
-nm_setting_wireless_get_type
-nm_setting_wireless_new
-nm_setting_wireless_get_ssid
-nm_setting_wireless_get_mode
-nm_setting_wireless_get_band
-nm_setting_wireless_get_channel
-nm_setting_wireless_get_bssid
-nm_setting_wireless_get_rate
-nm_setting_wireless_get_tx_power
-nm_setting_wireless_get_mac_address
-nm_setting_wireless_get_cloned_mac_address
-nm_setting_wireless_get_mtu
-nm_setting_wireless_get_security
-nm_setting_wireless_add_seen_bssid
-nm_setting_wireless_get_num_seen_bssids
-nm_setting_wireless_get_seen_bssid
-nm_setting_wireless_ap_security_compatible
-
-NM_SETTING_WIRELESS
-NM_IS_SETTING_WIRELESS
-NM_TYPE_SETTING_WIRELESS
-nm_setting_wireless_error_get_type
-NM_SETTING_WIRELESS_CLASS
-NM_IS_SETTING_WIRELESS_CLASS
-NM_SETTING_WIRELESS_GET_CLASS
-

-
-

-nm-setting-cdma
-NMSettingCdma
-NM_SETTING_CDMA_SETTING_NAME
-NMSettingCdmaError
-NM_TYPE_SETTING_CDMA_ERROR
-NM_SETTING_CDMA_ERROR
-nm_setting_cdma_error_quark
-NM_SETTING_CDMA_NUMBER
-NM_SETTING_CDMA_USERNAME
-NM_SETTING_CDMA_PASSWORD
-NMSettingCdma
-NMSettingCdmaClass
-nm_setting_cdma_get_type
-nm_setting_cdma_new
-nm_setting_cdma_get_number
-nm_setting_cdma_get_username
-nm_setting_cdma_get_password
-
-NM_SETTING_CDMA
-NM_IS_SETTING_CDMA
-NM_TYPE_SETTING_CDMA
-nm_setting_cdma_error_get_type
-NM_SETTING_CDMA_CLASS
-NM_IS_SETTING_CDMA_CLASS
-NM_SETTING_CDMA_GET_CLASS
-

-
-

-nm-setting-ip4-config
-NMSettingIP4Config
-NM_SETTING_IP4_CONFIG_SETTING_NAME
-NMSettingIP4ConfigError
-NM_TYPE_SETTING_IP4_CONFIG_ERROR
-NM_SETTING_IP4_CONFIG_ERROR
-nm_setting_ip4_config_error_quark
-NM_SETTING_IP4_CONFIG_METHOD
-NM_SETTING_IP4_CONFIG_DNS
-NM_SETTING_IP4_CONFIG_DNS_SEARCH
-NM_SETTING_IP4_CONFIG_ADDRESSES
-NM_SETTING_IP4_CONFIG_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
-NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
-NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP4_CONFIG_MAY_FAIL
-NM_SETTING_IP4_CONFIG_METHOD_AUTO
-NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
-NM_SETTING_IP4_CONFIG_METHOD_MANUAL
-NM_SETTING_IP4_CONFIG_METHOD_SHARED
-NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-NMIP4Address
-nm_ip4_address_new
-nm_ip4_address_dup
-nm_ip4_address_ref
-nm_ip4_address_unref
-nm_ip4_address_compare
-nm_ip4_address_get_address
-nm_ip4_address_set_address
-nm_ip4_address_get_prefix
-nm_ip4_address_set_prefix
-nm_ip4_address_get_gateway
-nm_ip4_address_set_gateway
-NMIP4Route
-nm_ip4_route_new
-nm_ip4_route_dup
-nm_ip4_route_ref
-nm_ip4_route_unref
-nm_ip4_route_compare
-nm_ip4_route_get_dest
-nm_ip4_route_set_dest
-nm_ip4_route_get_prefix
-nm_ip4_route_set_prefix
-nm_ip4_route_get_next_hop
-nm_ip4_route_set_next_hop
-nm_ip4_route_get_metric
-nm_ip4_route_set_metric
-NMSettingIP4Config
-NMSettingIP4ConfigClass
-nm_setting_ip4_config_get_type
-nm_setting_ip4_config_new
-nm_setting_ip4_config_get_method
-nm_setting_ip4_config_get_num_dns
-nm_setting_ip4_config_get_dns
-nm_setting_ip4_config_add_dns
-nm_setting_ip4_config_remove_dns
-nm_setting_ip4_config_clear_dns
-nm_setting_ip4_config_get_num_dns_searches
-nm_setting_ip4_config_get_dns_search
-nm_setting_ip4_config_add_dns_search
-nm_setting_ip4_config_remove_dns_search
-nm_setting_ip4_config_clear_dns_searches
-nm_setting_ip4_config_get_num_addresses
-nm_setting_ip4_config_get_address
-nm_setting_ip4_config_add_address
-nm_setting_ip4_config_remove_address
-nm_setting_ip4_config_clear_addresses
-nm_setting_ip4_config_get_num_routes
-nm_setting_ip4_config_get_route
-nm_setting_ip4_config_add_route
-nm_setting_ip4_config_remove_route
-nm_setting_ip4_config_clear_routes
-nm_setting_ip4_config_get_ignore_auto_routes
-nm_setting_ip4_config_get_ignore_auto_dns
-nm_setting_ip4_config_get_dhcp_client_id
-nm_setting_ip4_config_get_dhcp_send_hostname
-nm_setting_ip4_config_get_dhcp_hostname
-nm_setting_ip4_config_get_never_default
-nm_setting_ip4_config_get_may_fail
-
-NM_SETTING_IP4_CONFIG
-NM_IS_SETTING_IP4_CONFIG
-NM_TYPE_SETTING_IP4_CONFIG
-nm_setting_ip4_config_error_get_type
-NM_SETTING_IP4_CONFIG_CLASS
-NM_IS_SETTING_IP4_CONFIG_CLASS
-NM_SETTING_IP4_CONFIG_GET_CLASS
-

-
 

 nm-setting-wireless-security
 NMSettingWirelessSecurity
@@ -546,9 +280,12 @@ NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
 NM_SETTING_WIRELESS_SECURITY_PSK
+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 NMSettingWirelessSecurity
 NMSettingWirelessSecurityClass
 nm_setting_wireless_security_get_type
@@ -570,12 +307,15 @@ nm_setting_wireless_security_add_group
 nm_setting_wireless_security_remove_group
 nm_setting_wireless_security_clear_groups
 nm_setting_wireless_security_get_psk
+nm_setting_wireless_security_get_psk_flags
 nm_setting_wireless_security_get_leap_username
 nm_setting_wireless_security_get_leap_password
+nm_setting_wireless_security_get_leap_password_flags
 nm_setting_wireless_security_get_wep_key
 nm_setting_wireless_security_set_wep_key
 nm_setting_wireless_security_get_wep_tx_keyidx
 nm_setting_wireless_security_get_auth_alg
+nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
 
 NM_SETTING_WIRELESS_SECURITY
@@ -587,6 +327,465 @@ NM_IS_SETTING_WIRELESS_SECURITY_CLASS
 NM_SETTING_WIRELESS_SECURITY_GET_CLASS
 

 
+

+nm-setting-ip6-config
+NMSettingIP6Config
+NM_SETTING_IP6_CONFIG_SETTING_NAME
+NMSettingIP6ConfigError
+NM_TYPE_SETTING_IP6_CONFIG_ERROR
+NM_SETTING_IP6_CONFIG_ERROR
+nm_setting_ip6_config_error_quark
+NM_SETTING_IP6_CONFIG_METHOD
+NM_SETTING_IP6_CONFIG_DNS
+NM_SETTING_IP6_CONFIG_DNS_SEARCH
+NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_ROUTES
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP6_CONFIG_MAY_FAIL
+NM_SETTING_IP6_CONFIG_METHOD_IGNORE
+NM_SETTING_IP6_CONFIG_METHOD_AUTO
+NM_SETTING_IP6_CONFIG_METHOD_DHCP
+NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
+NM_SETTING_IP6_CONFIG_METHOD_MANUAL
+NM_SETTING_IP6_CONFIG_METHOD_SHARED
+NMIP6Address
+nm_ip6_address_get_type
+nm_ip6_address_new
+nm_ip6_address_dup
+nm_ip6_address_ref
+nm_ip6_address_unref
+nm_ip6_address_compare
+nm_ip6_address_get_address
+nm_ip6_address_set_address
+nm_ip6_address_get_prefix
+nm_ip6_address_set_prefix
+nm_ip6_address_get_gateway
+nm_ip6_address_set_gateway
+NMIP6Route
+nm_ip6_route_get_type
+nm_ip6_route_new
+nm_ip6_route_dup
+nm_ip6_route_ref
+nm_ip6_route_unref
+nm_ip6_route_compare
+nm_ip6_route_get_dest
+nm_ip6_route_set_dest
+nm_ip6_route_get_prefix
+nm_ip6_route_set_prefix
+nm_ip6_route_get_next_hop
+nm_ip6_route_set_next_hop
+nm_ip6_route_get_metric
+nm_ip6_route_set_metric
+NMSettingIP6Config
+NMSettingIP6ConfigClass
+nm_setting_ip6_config_get_type
+nm_setting_ip6_config_new
+nm_setting_ip6_config_get_method
+nm_setting_ip6_config_get_num_dns
+nm_setting_ip6_config_get_dns
+nm_setting_ip6_config_add_dns
+nm_setting_ip6_config_remove_dns
+nm_setting_ip6_config_clear_dns
+nm_setting_ip6_config_get_num_dns_searches
+nm_setting_ip6_config_get_dns_search
+nm_setting_ip6_config_add_dns_search
+nm_setting_ip6_config_remove_dns_search
+nm_setting_ip6_config_clear_dns_searches
+nm_setting_ip6_config_get_num_addresses
+nm_setting_ip6_config_get_address
+nm_setting_ip6_config_add_address
+nm_setting_ip6_config_remove_address
+nm_setting_ip6_config_clear_addresses
+nm_setting_ip6_config_get_num_routes
+nm_setting_ip6_config_get_route
+nm_setting_ip6_config_add_route
+nm_setting_ip6_config_remove_route
+nm_setting_ip6_config_clear_routes
+nm_setting_ip6_config_get_ignore_auto_routes
+nm_setting_ip6_config_get_ignore_auto_dns
+nm_setting_ip6_config_get_never_default
+nm_setting_ip6_config_get_may_fail
+
+NM_SETTING_IP6_CONFIG
+NM_IS_SETTING_IP6_CONFIG
+NM_TYPE_SETTING_IP6_CONFIG
+nm_setting_ip6_config_error_get_type
+NM_SETTING_IP6_CONFIG_CLASS
+NM_IS_SETTING_IP6_CONFIG_CLASS
+NM_SETTING_IP6_CONFIG_GET_CLASS
+

+
+

+nm-setting-wimax
+NMSettingWimax
+NM_SETTING_WIMAX_SETTING_NAME
+NMSettingWimaxError
+NM_TYPE_SETTING_WIMAX_ERROR
+NM_SETTING_WIMAX_ERROR
+nm_setting_wimax_error_quark
+NM_SETTING_WIMAX_NETWORK_NAME
+NM_SETTING_WIMAX_MAC_ADDRESS
+NMSettingWimax
+NMSettingWimaxClass
+nm_setting_wimax_get_type
+nm_setting_wimax_new
+nm_setting_wimax_get_network_name
+nm_setting_wimax_get_mac_address
+
+NM_SETTING_WIMAX
+NM_IS_SETTING_WIMAX
+NM_TYPE_SETTING_WIMAX
+nm_setting_wimax_error_get_type
+NM_SETTING_WIMAX_CLASS
+NM_IS_SETTING_WIMAX_CLASS
+NM_SETTING_WIMAX_GET_CLASS
+

+
+

+nm-setting-ip4-config
+NMSettingIP4Config
+NM_SETTING_IP4_CONFIG_SETTING_NAME
+NMSettingIP4ConfigError
+NM_TYPE_SETTING_IP4_CONFIG_ERROR
+NM_SETTING_IP4_CONFIG_ERROR
+nm_setting_ip4_config_error_quark
+NM_SETTING_IP4_CONFIG_METHOD
+NM_SETTING_IP4_CONFIG_DNS
+NM_SETTING_IP4_CONFIG_DNS_SEARCH
+NM_SETTING_IP4_CONFIG_ADDRESSES
+NM_SETTING_IP4_CONFIG_ROUTES
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP4_CONFIG_MAY_FAIL
+NM_SETTING_IP4_CONFIG_METHOD_AUTO
+NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
+NM_SETTING_IP4_CONFIG_METHOD_MANUAL
+NM_SETTING_IP4_CONFIG_METHOD_SHARED
+NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+NMIP4Address
+nm_ip4_address_get_type
+nm_ip4_address_new
+nm_ip4_address_dup
+nm_ip4_address_ref
+nm_ip4_address_unref
+nm_ip4_address_compare
+nm_ip4_address_get_address
+nm_ip4_address_set_address
+nm_ip4_address_get_prefix
+nm_ip4_address_set_prefix
+nm_ip4_address_get_gateway
+nm_ip4_address_set_gateway
+NMIP4Route
+nm_ip4_route_get_type
+nm_ip4_route_new
+nm_ip4_route_dup
+nm_ip4_route_ref
+nm_ip4_route_unref
+nm_ip4_route_compare
+nm_ip4_route_get_dest
+nm_ip4_route_set_dest
+nm_ip4_route_get_prefix
+nm_ip4_route_set_prefix
+nm_ip4_route_get_next_hop
+nm_ip4_route_set_next_hop
+nm_ip4_route_get_metric
+nm_ip4_route_set_metric
+NMSettingIP4Config
+NMSettingIP4ConfigClass
+nm_setting_ip4_config_get_type
+nm_setting_ip4_config_new
+nm_setting_ip4_config_get_method
+nm_setting_ip4_config_get_num_dns
+nm_setting_ip4_config_get_dns
+nm_setting_ip4_config_add_dns
+nm_setting_ip4_config_remove_dns
+nm_setting_ip4_config_clear_dns
+nm_setting_ip4_config_get_num_dns_searches
+nm_setting_ip4_config_get_dns_search
+nm_setting_ip4_config_add_dns_search
+nm_setting_ip4_config_remove_dns_search
+nm_setting_ip4_config_clear_dns_searches
+nm_setting_ip4_config_get_num_addresses
+nm_setting_ip4_config_get_address
+nm_setting_ip4_config_add_address
+nm_setting_ip4_config_remove_address
+nm_setting_ip4_config_clear_addresses
+nm_setting_ip4_config_get_num_routes
+nm_setting_ip4_config_get_route
+nm_setting_ip4_config_add_route
+nm_setting_ip4_config_remove_route
+nm_setting_ip4_config_clear_routes
+nm_setting_ip4_config_get_ignore_auto_routes
+nm_setting_ip4_config_get_ignore_auto_dns
+nm_setting_ip4_config_get_dhcp_client_id
+nm_setting_ip4_config_get_dhcp_send_hostname
+nm_setting_ip4_config_get_dhcp_hostname
+nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_get_may_fail
+
+NM_SETTING_IP4_CONFIG
+NM_IS_SETTING_IP4_CONFIG
+NM_TYPE_SETTING_IP4_CONFIG
+nm_setting_ip4_config_error_get_type
+NM_SETTING_IP4_CONFIG_CLASS
+NM_IS_SETTING_IP4_CONFIG_CLASS
+NM_SETTING_IP4_CONFIG_GET_CLASS
+

+
+

+nm-setting-wired
+NMSettingWired
+NM_SETTING_WIRED_SETTING_NAME
+NMSettingWiredError
+NM_TYPE_SETTING_WIRED_ERROR
+NM_SETTING_WIRED_ERROR
+nm_setting_wired_error_quark
+NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_SPEED
+NM_SETTING_WIRED_DUPLEX
+NM_SETTING_WIRED_AUTO_NEGOTIATE
+NM_SETTING_WIRED_MAC_ADDRESS
+NM_SETTING_WIRED_CLONED_MAC_ADDRESS
+NM_SETTING_WIRED_MTU
+NM_SETTING_WIRED_S390_SUBCHANNELS
+NM_SETTING_WIRED_S390_NETTYPE
+NM_SETTING_WIRED_S390_OPTIONS
+NMSettingWired
+NMSettingWiredClass
+nm_setting_wired_get_type
+nm_setting_wired_new
+nm_setting_wired_get_port
+nm_setting_wired_get_speed
+nm_setting_wired_get_duplex
+nm_setting_wired_get_auto_negotiate
+nm_setting_wired_get_mac_address
+nm_setting_wired_get_cloned_mac_address
+nm_setting_wired_get_mtu
+nm_setting_wired_get_s390_subchannels
+nm_setting_wired_get_s390_nettype
+nm_setting_wired_get_num_s390_options
+nm_setting_wired_get_s390_option
+nm_setting_wired_get_s390_option_by_key
+nm_setting_wired_add_s390_option
+nm_setting_wired_remove_s390_option
+
+NM_SETTING_WIRED
+NM_IS_SETTING_WIRED
+NM_TYPE_SETTING_WIRED
+nm_setting_wired_error_get_type
+NM_SETTING_WIRED_CLASS
+NM_IS_SETTING_WIRED_CLASS
+NM_SETTING_WIRED_GET_CLASS
+

+
+

+nm-setting-connection
+NMSettingConnection
+NM_SETTING_CONNECTION_SETTING_NAME
+NMSettingConnectionError
+NM_TYPE_SETTING_CONNECTION_ERROR
+NM_SETTING_CONNECTION_ERROR
+nm_setting_connection_error_quark
+NM_SETTING_CONNECTION_ID
+NM_SETTING_CONNECTION_UUID
+NM_SETTING_CONNECTION_TYPE
+NM_SETTING_CONNECTION_AUTOCONNECT
+NM_SETTING_CONNECTION_TIMESTAMP
+NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_PERMISSIONS
+NMSettingConnection
+NMSettingConnectionClass
+nm_setting_connection_get_type
+nm_setting_connection_new
+nm_setting_connection_get_id
+nm_setting_connection_get_uuid
+nm_setting_connection_get_connection_type
+nm_setting_connection_get_autoconnect
+nm_setting_connection_get_timestamp
+nm_setting_connection_get_read_only
+nm_setting_connection_get_num_permissions
+nm_setting_connection_get_permission
+nm_setting_connection_permissions_user_allowed
+nm_setting_connection_add_permission
+nm_setting_connection_remove_permission
+
+NM_SETTING_CONNECTION
+NM_IS_SETTING_CONNECTION
+NM_TYPE_SETTING_CONNECTION
+nm_setting_connection_error_get_type
+NM_SETTING_CONNECTION_CLASS
+NM_IS_SETTING_CONNECTION_CLASS
+NM_SETTING_CONNECTION_GET_CLASS
+

+
+

+nm-setting
+NMSetting
+NMSettingError
+NM_TYPE_SETTING_ERROR
+NM_SETTING_ERROR
+nm_setting_error_quark
+NM_SETTING_PARAM_SERIALIZE
+NM_SETTING_PARAM_REQUIRED
+NM_SETTING_PARAM_SECRET
+NM_SETTING_PARAM_FUZZY_IGNORE
+NM_SETTING_NAME
+NMSettingSecretFlags
+NMSetting
+NMSettingClass
+NMSettingValueIterFn
+nm_setting_get_type
+NMSettingHashFlags
+nm_setting_to_hash
+nm_setting_new_from_hash
+nm_setting_duplicate
+nm_setting_get_name
+nm_setting_verify
+NMSettingCompareFlags
+nm_setting_compare
+NMSettingDiffResult
+nm_setting_diff
+nm_setting_enumerate_values
+nm_setting_to_string
+nm_setting_clear_secrets
+nm_setting_need_secrets
+nm_setting_update_secrets
+nm_setting_get_secret_flags
+nm_setting_set_secret_flags
+
+NM_SETTING
+NM_IS_SETTING
+NM_TYPE_SETTING
+nm_setting_error_get_type
+NM_SETTING_CLASS
+NM_IS_SETTING_CLASS
+NM_SETTING_GET_CLASS
+

+
+

+nm-setting-ppp
+NMSettingPPP
+NM_SETTING_PPP_SETTING_NAME
+NMSettingPPPError
+NM_TYPE_SETTING_PPP_ERROR
+NM_SETTING_PPP_ERROR
+nm_setting_ppp_error_quark
+NM_SETTING_PPP_NOAUTH
+NM_SETTING_PPP_REFUSE_EAP
+NM_SETTING_PPP_REFUSE_PAP
+NM_SETTING_PPP_REFUSE_CHAP
+NM_SETTING_PPP_REFUSE_MSCHAP
+NM_SETTING_PPP_REFUSE_MSCHAPV2
+NM_SETTING_PPP_NOBSDCOMP
+NM_SETTING_PPP_NODEFLATE
+NM_SETTING_PPP_NO_VJ_COMP
+NM_SETTING_PPP_REQUIRE_MPPE
+NM_SETTING_PPP_REQUIRE_MPPE_128
+NM_SETTING_PPP_MPPE_STATEFUL
+NM_SETTING_PPP_CRTSCTS
+NM_SETTING_PPP_BAUD
+NM_SETTING_PPP_MRU
+NM_SETTING_PPP_MTU
+NM_SETTING_PPP_LCP_ECHO_FAILURE
+NM_SETTING_PPP_LCP_ECHO_INTERVAL
+NMSettingPPP
+NMSettingPPPClass
+nm_setting_ppp_get_type
+nm_setting_ppp_new
+nm_setting_ppp_get_noauth
+nm_setting_ppp_get_refuse_eap
+nm_setting_ppp_get_refuse_pap
+nm_setting_ppp_get_refuse_chap
+nm_setting_ppp_get_refuse_mschap
+nm_setting_ppp_get_refuse_mschapv2
+nm_setting_ppp_get_nobsdcomp
+nm_setting_ppp_get_nodeflate
+nm_setting_ppp_get_no_vj_comp
+nm_setting_ppp_get_require_mppe
+nm_setting_ppp_get_require_mppe_128
+nm_setting_ppp_get_mppe_stateful
+nm_setting_ppp_get_crtscts
+nm_setting_ppp_get_baud
+nm_setting_ppp_get_mru
+nm_setting_ppp_get_mtu
+nm_setting_ppp_get_lcp_echo_failure
+nm_setting_ppp_get_lcp_echo_interval
+
+NM_SETTING_PPP
+NM_IS_SETTING_PPP
+NM_TYPE_SETTING_PPP
+nm_setting_ppp_error_get_type
+NM_SETTING_PPP_CLASS
+NM_IS_SETTING_PPP_CLASS
+NM_SETTING_PPP_GET_CLASS
+

+
+

+nm-connection
+NMConnection
+NMConnectionError
+NM_TYPE_CONNECTION_ERROR
+NM_CONNECTION_ERROR
+nm_connection_error_quark
+NM_CONNECTION_PATH
+NMConnection
+NMConnectionClass
+nm_connection_get_type
+nm_connection_new
+nm_connection_new_from_hash
+nm_connection_duplicate
+nm_connection_create_setting
+nm_connection_add_setting
+nm_connection_remove_setting
+nm_connection_get_setting
+nm_connection_get_setting_by_name
+nm_connection_replace_settings
+nm_connection_compare
+nm_connection_diff
+nm_connection_verify
+nm_connection_need_secrets
+nm_connection_clear_secrets
+nm_connection_update_secrets
+nm_connection_set_path
+nm_connection_get_path
+nm_connection_for_each_setting_value
+nm_connection_to_hash
+nm_connection_dump
+nm_connection_lookup_setting_type
+nm_connection_lookup_setting_type_by_quark
+nm_connection_get_uuid
+nm_connection_get_id
+nm_connection_get_setting_802_1x
+nm_connection_get_setting_bluetooth
+nm_connection_get_setting_cdma
+nm_connection_get_setting_connection
+nm_connection_get_setting_gsm
+nm_connection_get_setting_ip4_config
+nm_connection_get_setting_ip6_config
+nm_connection_get_setting_olpc_mesh
+nm_connection_get_setting_ppp
+nm_connection_get_setting_pppoe
+nm_connection_get_setting_vpn
+nm_connection_get_setting_wimax
+nm_connection_get_setting_wired
+nm_connection_get_setting_wireless
+nm_connection_get_setting_wireless_security
+
+NM_CONNECTION
+NM_IS_CONNECTION
+NM_TYPE_CONNECTION
+nm_connection_error_get_type
+NM_CONNECTION_CLASS
+NM_IS_CONNECTION_CLASS
+NM_CONNECTION_GET_CLASS
+

+
 

 nm-setting-pppoe
 NMSettingPPPOE
@@ -598,6 +797,7 @@ nm_setting_pppoe_error_quark
 NM_SETTING_PPPOE_SERVICE
 NM_SETTING_PPPOE_USERNAME
 NM_SETTING_PPPOE_PASSWORD
+NM_SETTING_PPPOE_PASSWORD_FLAGS
 NMSettingPPPOE
 NMSettingPPPOEClass
 nm_setting_pppoe_get_type
@@ -605,6 +805,7 @@ nm_setting_pppoe_new
 nm_setting_pppoe_get_service
 nm_setting_pppoe_get_username
 nm_setting_pppoe_get_password
+nm_setting_pppoe_get_password_flags
 
 NM_SETTING_PPPOE
 NM_IS_SETTING_PPPOE
@@ -615,207 +816,6 @@ NM_IS_SETTING_PPPOE_CLASS
 NM_SETTING_PPPOE_GET_CLASS
 

 
-

-nm-setting-connection
-NMSettingConnection
-NM_SETTING_CONNECTION_SETTING_NAME
-NMSettingConnectionError
-NM_TYPE_SETTING_CONNECTION_ERROR
-NM_SETTING_CONNECTION_ERROR
-nm_setting_connection_error_quark
-NM_SETTING_CONNECTION_ID
-NM_SETTING_CONNECTION_UUID
-NM_SETTING_CONNECTION_TYPE
-NM_SETTING_CONNECTION_AUTOCONNECT
-NM_SETTING_CONNECTION_TIMESTAMP
-NM_SETTING_CONNECTION_READ_ONLY
-NMSettingConnection
-NMSettingConnectionClass
-nm_setting_connection_get_type
-nm_setting_connection_new
-nm_setting_connection_get_id
-nm_setting_connection_get_uuid
-nm_setting_connection_get_connection_type
-nm_setting_connection_get_autoconnect
-nm_setting_connection_get_timestamp
-nm_setting_connection_get_read_only
-
-NM_SETTING_CONNECTION
-NM_IS_SETTING_CONNECTION
-NM_TYPE_SETTING_CONNECTION
-nm_setting_connection_error_get_type
-NM_SETTING_CONNECTION_CLASS
-NM_IS_SETTING_CONNECTION_CLASS
-NM_SETTING_CONNECTION_GET_CLASS
-

-
-

-nm-setting-gsm
-NMSettingGsm
-NM_SETTING_GSM_SETTING_NAME
-NMSettingGsmError
-NM_TYPE_SETTING_GSM_ERROR
-NM_SETTING_GSM_ERROR
-nm_setting_gsm_error_quark
-NM_SETTING_GSM_NUMBER
-NM_SETTING_GSM_USERNAME
-NM_SETTING_GSM_PASSWORD
-NM_SETTING_GSM_APN
-NM_SETTING_GSM_NETWORK_ID
-NM_SETTING_GSM_NETWORK_TYPE
-NM_SETTING_GSM_ALLOWED_BANDS
-NM_SETTING_GSM_PIN
-NM_SETTING_GSM_HOME_ONLY
-NM_SETTING_GSM_PUK
-NM_SETTING_GSM_BAND
-NM_GSM_NETWORK_ANY
-NM_GSM_NETWORK_UMTS_HSPA
-NM_GSM_NETWORK_GPRS_EDGE
-NM_GSM_NETWORK_PREFER_UMTS_HSPA
-NM_GSM_NETWORK_PREFER_GPRS_EDGE
-NMSettingGsmNetworkType
-NMSettingGsmNetworkBand
-NMSettingGsm
-NMSettingGsmClass
-nm_setting_gsm_get_type
-nm_setting_gsm_new
-nm_setting_gsm_get_number
-nm_setting_gsm_get_username
-nm_setting_gsm_get_password
-nm_setting_gsm_get_apn
-nm_setting_gsm_get_network_id
-nm_setting_gsm_get_network_type
-nm_setting_gsm_get_allowed_bands
-nm_setting_gsm_get_pin
-nm_setting_gsm_get_home_only
-nm_setting_gsm_get_puk
-nm_setting_gsm_get_band
-
-NM_SETTING_GSM
-NM_IS_SETTING_GSM
-NM_TYPE_SETTING_GSM
-nm_setting_gsm_error_get_type
-NM_SETTING_GSM_CLASS
-NM_IS_SETTING_GSM_CLASS
-NM_SETTING_GSM_GET_CLASS
-

-
-

-nm-setting-ip6-config
-NMSettingIP6Config
-NM_SETTING_IP6_CONFIG_SETTING_NAME
-NMSettingIP6ConfigError
-NM_TYPE_SETTING_IP6_CONFIG_ERROR
-NM_SETTING_IP6_CONFIG_ERROR
-nm_setting_ip6_config_error_quark
-NM_SETTING_IP6_CONFIG_METHOD
-NM_SETTING_IP6_CONFIG_DNS
-NM_SETTING_IP6_CONFIG_DNS_SEARCH
-NM_SETTING_IP6_CONFIG_ADDRESSES
-NM_SETTING_IP6_CONFIG_ROUTES
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
-NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP6_CONFIG_MAY_FAIL
-NM_SETTING_IP6_CONFIG_METHOD_IGNORE
-NM_SETTING_IP6_CONFIG_METHOD_AUTO
-NM_SETTING_IP6_CONFIG_METHOD_DHCP
-NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
-NM_SETTING_IP6_CONFIG_METHOD_MANUAL
-NM_SETTING_IP6_CONFIG_METHOD_SHARED
-NMIP6Address
-nm_ip6_address_new
-nm_ip6_address_dup
-nm_ip6_address_ref
-nm_ip6_address_unref
-nm_ip6_address_compare
-nm_ip6_address_get_address
-nm_ip6_address_set_address
-nm_ip6_address_get_prefix
-nm_ip6_address_set_prefix
-nm_ip6_address_get_gateway
-nm_ip6_address_set_gateway
-NMIP6Route
-nm_ip6_route_new
-nm_ip6_route_dup
-nm_ip6_route_ref
-nm_ip6_route_unref
-nm_ip6_route_compare
-nm_ip6_route_get_dest
-nm_ip6_route_set_dest
-nm_ip6_route_get_prefix
-nm_ip6_route_set_prefix
-nm_ip6_route_get_next_hop
-nm_ip6_route_set_next_hop
-nm_ip6_route_get_metric
-nm_ip6_route_set_metric
-NMSettingIP6Config
-NMSettingIP6ConfigClass
-nm_setting_ip6_config_get_type
-nm_setting_ip6_config_new
-nm_setting_ip6_config_get_method
-nm_setting_ip6_config_get_num_dns
-nm_setting_ip6_config_get_dns
-nm_setting_ip6_config_add_dns
-nm_setting_ip6_config_remove_dns
-nm_setting_ip6_config_clear_dns
-nm_setting_ip6_config_get_num_dns_searches
-nm_setting_ip6_config_get_dns_search
-nm_setting_ip6_config_add_dns_search
-nm_setting_ip6_config_remove_dns_search
-nm_setting_ip6_config_clear_dns_searches
-nm_setting_ip6_config_get_num_addresses
-nm_setting_ip6_config_get_address
-nm_setting_ip6_config_add_address
-nm_setting_ip6_config_remove_address
-nm_setting_ip6_config_clear_addresses
-nm_setting_ip6_config_get_num_routes
-nm_setting_ip6_config_get_route
-nm_setting_ip6_config_add_route
-nm_setting_ip6_config_remove_route
-nm_setting_ip6_config_clear_routes
-nm_setting_ip6_config_get_ignore_auto_routes
-nm_setting_ip6_config_get_ignore_auto_dns
-nm_setting_ip6_config_get_never_default
-nm_setting_ip6_config_get_may_fail
-
-NM_SETTING_IP6_CONFIG
-NM_IS_SETTING_IP6_CONFIG
-NM_TYPE_SETTING_IP6_CONFIG
-nm_setting_ip6_config_error_get_type
-NM_SETTING_IP6_CONFIG_CLASS
-NM_IS_SETTING_IP6_CONFIG_CLASS
-NM_SETTING_IP6_CONFIG_GET_CLASS
-

-
-

-nm-setting-bluetooth
-NMSettingBluetooth
-NM_SETTING_BLUETOOTH_SETTING_NAME
-NMSettingBluetoothError
-NM_TYPE_SETTING_BLUETOOTH_ERROR
-NM_SETTING_BLUETOOTH_ERROR
-nm_setting_bluetooth_error_quark
-NM_SETTING_BLUETOOTH_BDADDR
-NM_SETTING_BLUETOOTH_TYPE
-NM_SETTING_BLUETOOTH_TYPE_DUN
-NM_SETTING_BLUETOOTH_TYPE_PANU
-NMSettingBluetooth
-NMSettingBluetoothClass
-nm_setting_bluetooth_get_type
-nm_setting_bluetooth_new
-nm_setting_bluetooth_get_bdaddr
-nm_setting_bluetooth_get_connection_type
-
-NM_SETTING_BLUETOOTH
-NM_IS_SETTING_BLUETOOTH
-NM_TYPE_SETTING_BLUETOOTH
-nm_setting_bluetooth_error_get_type
-NM_SETTING_BLUETOOTH_CLASS
-NM_IS_SETTING_BLUETOOTH_CLASS
-NM_SETTING_BLUETOOTH_GET_CLASS
-

-
 

 nm-setting-vpn
 NMSettingVPN
@@ -830,7 +830,7 @@ NM_SETTING_VPN_DATA
 NM_SETTING_VPN_SECRETS
 NMSettingVPN
 NMSettingVPNClass
-VPNIterFunc
+NMVPNIterFunc
 nm_setting_vpn_get_type
 nm_setting_vpn_new
 nm_setting_vpn_get_service_type
@@ -853,18 +853,59 @@ NM_IS_SETTING_VPN_CLASS
 NM_SETTING_VPN_GET_CLASS
 

 
+

+nm-setting-wireless
+NMSettingWireless
+NM_SETTING_WIRELESS_SETTING_NAME
+NMSettingWirelessError
+NM_TYPE_SETTING_WIRELESS_ERROR
+NM_SETTING_WIRELESS_ERROR
+nm_setting_wireless_error_quark
+NM_SETTING_WIRELESS_SSID
+NM_SETTING_WIRELESS_MODE
+NM_SETTING_WIRELESS_BAND
+NM_SETTING_WIRELESS_CHANNEL
+NM_SETTING_WIRELESS_BSSID
+NM_SETTING_WIRELESS_RATE
+NM_SETTING_WIRELESS_TX_POWER
+NM_SETTING_WIRELESS_MAC_ADDRESS
+NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+NM_SETTING_WIRELESS_MTU
+NM_SETTING_WIRELESS_SEEN_BSSIDS
+NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_MODE_ADHOC
+NM_SETTING_WIRELESS_MODE_INFRA
+NMSettingWireless
+NMSettingWirelessClass
+nm_setting_wireless_get_type
+nm_setting_wireless_new
+nm_setting_wireless_get_ssid
+nm_setting_wireless_get_mode
+nm_setting_wireless_get_band
+nm_setting_wireless_get_channel
+nm_setting_wireless_get_bssid
+nm_setting_wireless_get_rate
+nm_setting_wireless_get_tx_power
+nm_setting_wireless_get_mac_address
+nm_setting_wireless_get_cloned_mac_address
+nm_setting_wireless_get_mtu
+nm_setting_wireless_get_security
+nm_setting_wireless_add_seen_bssid
+nm_setting_wireless_get_num_seen_bssids
+nm_setting_wireless_get_seen_bssid
+nm_setting_wireless_ap_security_compatible
+
+NM_SETTING_WIRELESS
+NM_IS_SETTING_WIRELESS
+NM_TYPE_SETTING_WIRELESS
+nm_setting_wireless_error_get_type
+NM_SETTING_WIRELESS_CLASS
+NM_IS_SETTING_WIRELESS_CLASS
+NM_SETTING_WIRELESS_GET_CLASS
+

+
 

 nm-utils
-nm_print_backtrace
-nm_get_timestamp
-nm_info
-nm_info_str
-nm_debug
-nm_debug_str
-nm_warning
-nm_warning_str
-nm_error
-nm_error_str
 nm_utils_init
 nm_utils_deinit
 nm_utils_is_empty_ssid
@@ -897,3 +938,8 @@ nm_utils_wifi_find_next_channel
 nm_utils_wifi_is_channel_valid
 

 
+

+nm-setting-private
+NM_SETTING_SECRET_FLAGS_ALL
+

+
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
deleted file mode 100644
index c0283767..00000000
--- a/docs/libnm-util/libnm-util.types
+++ /dev/null
@@ -1,34 +0,0 @@
-nm_connection_error_get_type
-nm_connection_get_type
-nm_setting_802_1x_error_get_type
-nm_setting_802_1x_get_type
-nm_setting_bluetooth_error_get_type
-nm_setting_bluetooth_get_type
-nm_setting_cdma_error_get_type
-nm_setting_cdma_get_type
-nm_setting_connection_error_get_type
-nm_setting_connection_get_type
-nm_setting_error_get_type
-nm_setting_get_type
-nm_setting_gsm_error_get_type
-nm_setting_gsm_get_type
-nm_setting_ip4_config_error_get_type
-nm_setting_ip4_config_get_type
-nm_setting_ip6_config_error_get_type
-nm_setting_ip6_config_get_type
-nm_setting_olpc_mesh_error_get_type
-nm_setting_olpc_mesh_get_type
-nm_setting_ppp_error_get_type
-nm_setting_ppp_get_type
-nm_setting_pppoe_error_get_type
-nm_setting_pppoe_get_type
-nm_setting_serial_error_get_type
-nm_setting_serial_get_type
-nm_setting_vpn_error_get_type
-nm_setting_vpn_get_type
-nm_setting_wired_error_get_type
-nm_setting_wired_get_type
-nm_setting_wireless_error_get_type
-nm_setting_wireless_get_type
-nm_setting_wireless_security_error_get_type
-nm_setting_wireless_security_get_type
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
deleted file mode 100644
index f9d52c98..00000000
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,349 +0,0 @@
-
-NMConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CONNECTION_SCOPE_UNKNOWN: 
-@NM_CONNECTION_SCOPE_SYSTEM: 
-@NM_CONNECTION_SCOPE_USER: 
-
-
-
-
-
-
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmconnection: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@secrets_updated: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@hash: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@setting: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@setting_secrets: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@scope: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@path: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@error_quark: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index c6742d9b..00000000
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,968 +0,0 @@
-
-NMSetting8021x
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@value: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_TYPE_UNKNOWN: 
-@NM_SETTING_802_1X_CK_TYPE_X509: 
-@NM_SETTING_802_1X_CK_TYPE_RAW_KEY: 
-@NM_SETTING_802_1X_CK_TYPE_PKCS12: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@filename: 
-@password: 
-@out_ck_type: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index e698b78c..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-NMSettingBluetooth
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
-@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index 7cd8fbc7..00000000
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-NMSettingCdma
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index ad17800f..00000000
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,225 +0,0 @@
-
-NMSettingConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index fd7dc209..00000000
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,396 +0,0 @@
-
-NMSettingGsm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-
-
-
-
-
-
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index 41fc9aab..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,760 +0,0 @@
-
-NMSettingIP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@prefix: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@gateway: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@prefix: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@metric: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 456b5f29..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,704 +0,0 @@
-
-NMSettingIP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@prefix: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@gw: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@prefix: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@metric: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index 7c44977c..00000000
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-NMSettingOlpcMesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index bc80c47b..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,477 +0,0 @@
-
-NMSettingPPP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index 7bd9fd38..00000000
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-NMSettingPPPOE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index 20e68412..00000000
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,204 +0,0 @@
-
-NMSettingSerial
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index ad33652a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,252 +0,0 @@
-
-NMSettingVPN
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@key: 
-@value: 
-@user_data: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@item: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@secret: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index 8b524247..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,351 +0,0 @@
-
-NMSettingWired
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@item: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index eb576bb9..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,501 +0,0 @@
-
-NMSettingWirelessSecurity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@key: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index 69a60b5b..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,386 +0,0 @@
-
-NMSettingWireless
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
-@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
deleted file mode 100644
index 832a29c6..00000000
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,276 +0,0 @@
-
-NMSetting
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@verify: 
-@need_secrets: 
-@update_one_secret: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting_type: 
-@hash: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@all_settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secrets: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
deleted file mode 100644
index 15c82f33..00000000
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,404 +0,0 @@
-
-nm-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@timestamp: 
-
-
-
-
-
-
-
-@fmt: 
-@args...: 
-
-
-
-
-
-
-
-@fmt_str: 
-@args...: 
-
-
-
-
-
-
-
-@fmt: 
-@args...: 
-
-
-
-
-
-
-
-@fmt_str: 
-@args...: 
-
-
-
-
-
-
-
-@fmt: 
-@args...: 
-
-
-
-
-
-
-
-@fmt_str: 
-@args...: 
-
-
-
-
-
-
-
-@fmt: 
-@args...: 
-
-
-
-
-
-
-
-@fmt_str: 
-@args...: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@hash: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@elem_destroy_fn: 
-
-
-
-
-
-
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-
-
-
-
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@netmask: 
-@Returns: 
-
-
-
-
-
-
-
-@prefix: 
-@Returns: 
-
-
-
-
-
-
-
-@ip: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@s: 
-@Returns: 
-
-
-
-
-
-
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@freq: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
diff --git a/docs/settings-spec.html b/docs/settings-spec.html
deleted file mode 100644
index eba3b1e9..00000000
--- a/docs/settings-spec.html
+++ /dev/null
@@ -1,993 +0,0 @@
-
-
-NetworkManager 0.8.4.0 Settings Specification
-
-
Setting name: '802-1x'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestring802-1xThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
eaparray of string[]The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
identitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
anonymous-identitystringAnonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
ca-certbyte array[]Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.
client-certbyte array[]Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
phase1-peapverstringForces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1; to force that specific PEAP version.
phase1-peaplabelstringForces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
phase1-fast-provisioningstringEnables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
phase2-authstringSpecifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
phase2-autheapstringSpecifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
phase2-ca-certbyte array[]Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
phase2-ca-pathstringUTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.
phase2-client-certbyte array[]Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-eap' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
passwordstringPassword used for EAP authentication methods.
private-keybyte array[]Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and X.509 private keys, this property should be set to the keys's decrypted DER encoded data.  When using X.509 private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data (which is encrypted) and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
private-key-passwordstringThe password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
phase2-private-keybyte array[]Contains the 'phase 2' inner private key when the 'phase2-eap' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and X.509 private keys, this property should be set to the keys's decrypted DER encoded data.  When using X.509 private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data (which is encrypted) and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
phase2-private-key-passwordstringThe password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.
system-ca-certsbooleanFALSEWhen TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.


-
Setting name: 'bluetooth'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringbluetoothThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
bdaddrbyte array[]The Bluetooth address of the device
typestringEither 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.


-
Setting name: 'cdma'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringcdmaThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
numberstringNumber to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.
usernamestringUsername used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
passwordstringPassword used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.


-
Setting name: 'connection'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringconnectionThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
idstringUser-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.
uuidstringUniversally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.
typestringBase type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).
autoconnectbooleanTRUEIf TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.
timestampuint640Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.
read-onlybooleanFALSEIf TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.


-
Setting name: 'gsm'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringgsmThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
numberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.
usernamestringUsername used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
passwordstringPassword used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
apnstringThe GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
network-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
network-typeint32-1Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G.  Note that not all devices allow network preference control.
bandint32-1Band (DEPRECATED and UNUSED)
pinstringIf the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
pukstringPUK (DEPRECATED and UNUSED)
allowed-bandsuint321Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.
home-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.


-
Setting name: 'ipv4'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringipv4The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
methodstringIPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.
dnsarray of uint32[]List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
dns-searcharray of string[]List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
addressesarray of array of uint32[]Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.
routesarray of array of uint32[]Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.
ignore-auto-routesbooleanFALSEWhen the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
ignore-auto-dnsbooleanFALSEWhen the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
dhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to cusomize the DHCP lease and options.
dhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.
dhcp-hostnamestringIf the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.
never-defaultbooleanFALSEIf TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.
may-failbooleanFALSEIf TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.


-
Setting name: 'ipv6'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringipv6The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
methodstringIPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
dnsarray of byte array[]Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
dns-searcharray of string[]List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
addressesarray of (byte array, uint32, byte array)[]Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.
routesarray of (byte array, uint32, byte array, uint32)[]Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.
ignore-auto-routesbooleanFALSEWhen the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
ignore-auto-dnsbooleanFALSEWhen the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
never-defaultbooleanFALSEIf TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.
may-failbooleanFALSEIf TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.


-
Setting name: '802-11-olpc-mesh'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestring802-11-olpc-meshThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
ssidbyte array[]SSID of the mesh network to join.
channeluint320Channel on which the mesh network to join is located.
dhcp-anycast-addressbyte array[]Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.


-
Setting name: 'ppp'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringpppThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
noauthbooleanTRUEIf TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
refuse-eapbooleanFALSEIf TRUE, the EAP authentication method will not be used.
refuse-papbooleanFALSEIf TRUE, the PAP authentication method will not be used.
refuse-chapbooleanFALSEIf TRUE, the CHAP authentication method will not be used.
refuse-mschapbooleanFALSEIf TRUE, the MSCHAP authentication method will not be used.
refuse-mschapv2booleanFALSEIf TRUE, the MSCHAPv2 authentication method will not be used.
nobsdcompbooleanFALSEIf TRUE, BSD compression will not be requested.
nodeflatebooleanFALSEIf TRUE, 'deflate' compression will not be requested.
no-vj-compbooleanFALSEIf TRUE, Van Jacobsen TCP header compression will not be requested.
require-mppebooleanFALSEIf TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
require-mppe-128booleanFALSEIf TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
mppe-statefulbooleanFALSEIf TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
crtsctsbooleanFALSEIf TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
bauduint320If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
mruuint320If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
mtuuint320If non-zero, instruct pppd to send packets no larger than the specified size.
lcp-echo-failureuint320If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.
lcp-echo-intervaluint320If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.


-
Setting name: 'pppoe'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringpppoeThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
servicestringIf specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
usernamestringUsername used to authenticate with the PPPoE service.
passwordstringPassword used to authenticate with the PPPoE service.


-
Setting name: 'serial'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringserialThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
bauduint3257600Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
bitsuint328Byte-width of the serial communication.  The 8 in '8n1' for example.
paritygchar110Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.
stopbitsuint321Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.
send-delayuint640Time to delay between each byte sent to the modem, in microseconds.


-
Setting name: 'vpn'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestringvpnThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
service-typestringD-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
user-namestringUser name of the currently logged in user for connections provided by the user settings service.  This name is provided to the VPN plugin to use in lieu of a custom username provided by that VPN plugins specific configuration.  The VPN plugin itself decides which user name to use.
datadict of (string::string)[ ]Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
secretsdict of (string::string)[ ]Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.


-
Setting name: '802-3-ethernet'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestring802-3-ethernetThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
portstringSpecific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.
speeduint320If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.
duplexstringIf specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.
auto-negotiatebooleanTRUEIf TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.
mac-addressbyte array[]If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
cloned-mac-addressbyte array[]If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
s390-subchannelsGPtrArray_gchararray_[]Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
s390-nettypestrings390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.
s390-optionsdict of (string::string)[ ]Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.


-
Setting name: '802-11-wireless'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestring802-11-wirelessThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
ssidbyte array[]SSID of the WiFi network.  Must be specified.
modestringWiFi network mode; one of 'infrastructure' or 'adhoc'.  If blank, infrastructure is assumed.
bandstring802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
channeluint320Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.
bssidbyte array[]If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
rateuint320If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
tx-poweruint320If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
mac-addressbyte array[]If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
cloned-mac-addressbyte array[]If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
seen-bssidsarray of string[]A list of BSSIDs (each BSSID formatted as a MAC address like '00:11:22:33:44:55') that have been detected as part of the WiFI network.  The settings service will usually populate this property by periodically asking NetworkManager what the device's current AP is while connected to the network (or monitoring the device's 'active-ap' property) and adding the current AP's BSSID to this list.  This list helps NetworkManager find hidden APs by matching up scan results with the BSSIDs in this list.
securitystringIf the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.


-
Setting name: '802-11-wireless-security'

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Key NameValue TypeDefault ValueValue Description
namestring802-11-wireless-securityThe setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
key-mgmtstringKey management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.
wep-tx-keyidxuint320When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
auth-algstringWhen WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.
protoarray of string[]List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
pairwisearray of string[]If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
grouparray of string[]If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
leap-usernamestringThe login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
wep-key0stringIndex 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key1stringIndex 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key2stringIndex 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
wep-key3stringIndex 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
pskstringPre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.
leap-passwordstringThe login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
wep-key-typeuint320Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.


-
-
diff --git a/docs/spec.html b/docs/spec.html
deleted file mode 100644
index 3873a98c..00000000
--- a/docs/spec.html
+++ /dev/null
@@ -1,1210 +0,0 @@
-
-NetworkManager D-Bus Interface Specification version 0.8
NetworkManager D-Bus Interface Specification
Version 0.8
Copyright (C) 2008 - 2009 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.

-
Interfaces

-  
org.freedesktop.NetworkManager
Methods:
GetDevices (
-        
-        ) →
-        ao

-        Get the list of network devices.
-      
Returns
devices -
-      ao

-          List of object paths of network devices known to the system.
-        
ActivateConnection (
-        s: service_name, o: connection, o: device, o: specific_object
-        ) →
-        o

-        Activate a connection using the supplied device.
-      
Parameters
service_name -
-      s

-          The D-Bus service name of the settings service that provides this connection.
-        
connection -
-      o

-          The connection to activate the devices with.
-        
device -
-      o

-          The object path of device to be activated for physical connections.  This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
-        
specific_object -
-      o

-          The path of a connection-type-specific object this activation should use. 
-          This parameter is currently ignored for wired and mobile broadband connections,
-          and the value of "/" should be used (ie, no specific object).  For WiFi
-          connections, pass the object path of a specific AP from the card's scan
-          list, or "/" to pick and AP automatically.  For VPN connections, pass
-          the object path of an ActiveConnection object that should serve as the
-          "base" connection (to which the VPN connections lifetime will be tied),
-          or pass "/" and NM will automatically use the current default device.
-        
Returns
active_connection -
-      o

-          The path of the active connection object representing this active connection.
-        
Possible errors
org.freedesktop.NetworkManager.Error.UnknownConnection

-        Connection was not provided by any known settings service.
-    (generic description)
org.freedesktop.NetworkManager.Error.UnknownDevice

-        Unknown device.
-    (generic description)
org.freedesktop.NetworkManager.Error.InvalidService

-        Invalid settings service (not a recognized system or user settings service name).
-    (generic description)
org.freedesktop.NetworkManager.Error.ConnectionActivating
Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?
org.freedesktop.NetworkManager.Error.ConnectionInvalid
The connection is invalid for this device.
DeactivateConnection (
-        o: active_connection
-        ) →
-        nothing

-        Deactivate an active connection.
-      
Parameters
active_connection -
-      o

-          The currently active connection to deactivate.
-        
Sleep (
-        b: sleep
-        ) →
-        nothing

-        Control the NetworkManager daemon's sleep state.  When asleep, all
-        interfaces that it manages are deactivated.  When awake, devices are
-        available to be activated.  This command should not be called directly
-        by users or clients; it is intended for system suspend/resume tracking.
-      
Parameters
sleep -
-      b

-          Indicates whether the NetworkManager daemon should sleep or wake.
-        
Enable (
-        b: enable
-        ) →
-        nothing

-        Control whether overall networking is enabled or disabled.  When
-        disabled, all interfaces that NM manages are deactivated.  When enabled,
-        all managed interfaces are re-enabled and available to be activated.
-        This command should be used by clients that provide to users the ability
-        to enable/disable all networking.
-      
Parameters
enable -
-      b

-          If FALSE, indicates that all networking should be disabled.  If TRUE,
-          indicates that NetworkManager should begin managing network devices.
-        
GetPermissions (
-        
-        ) →
-        a{ss}

-        Returns the permissions a caller has for various authenticated operations
-        that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
-      
Returns
permissions -
-      a{ss}

-          Dictionary of available permissions and results.  Each permission
-          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
-          and each result is one of the following values: "yes" (the permission
-          is available), "auth" (the permission is available after a successful
-          authentication), or "no" (the permission is denied).  Clients may use
-          these values in the UI to indicate the ability to perform certain
-          operations.
-        
SetLogging (
-        s: level, s: domains
-        ) →
-        nothing

-        Set logging verbosity and which operations are logged.
-      
Parameters
level -
-      s

-          One of [ERR, WARN, INFO, DEBUG].
-        
domains -
-      s

-          A combination of logging domains separated by commas (','), or "NONE"
-          to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [NONE, HW, RFKILL,
-          ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4,
-          DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE,
-          DEVICE, OLPC]
-        
sleep (
-        
-        ) →
-        nothing

-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.
-      
wake (
-        
-        ) →
-        nothing

-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When awake, all known interfaces are available to be activated.
-      
state (
-        
-        ) →
-        u

-        DEPRECATED.  The overall state of the NetworkManager daemon.
-      
Returns
state -
-      u
-      (NM_STATE)
-    
Signals:
CheckPermissions (
-        
-        )

-        Emitted when system authorization details change, indicating that
-        clients may wish to recheck permissions with GetPermissions.
-      
StateChanged (
-        u: state
-        )

-        NetworkManager's state changed.
-      
Parameters
state -
-      u
-      (NM_STATE)
-    

-          The new state of NetworkManager.
-        
PropertiesChanged (
-        a{sv}: properties
-        )

-        NetworkManager's properties changed.
-      
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-          The changed properties.
-        
DeviceAdded (
-        o: device_path
-        )

-        A device was added to the system
-      
Parameters
device_path -
-      o

-          The object path of the newly added device.
-        
DeviceRemoved (
-        o: device_path
-        )

-        A device was removed from the system, and is no longer available.
-      
Parameters
device_path -
-      o

-          The object path of the device that was just removed.
-        
StateChange (
-        u: state
-        )

-        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
-      
Parameters
state -
-      u
-      (NM_STATE)
-    

-          The new state of NetworkManager.
-        
Properties:
NetworkingEnabled -
-      b -
-      (read)

-        Indicates if overall networking is currently enabled or not.  See the
-        Enable() method.
-      
WirelessEnabled -
-      b -
-      (readwrite)

-        Indicates if wireless is currently enabled or not.
-      
WirelessHardwareEnabled -
-      b -
-      (read)

-        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      
WwanEnabled -
-      b -
-      (readwrite)

-        Indicates if mobile broadband devices are currently enabled or not.
-      
WwanHardwareEnabled -
-      b -
-      (read)

-        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
-      
ActiveConnections -
-      ao -
-      (read)

-        List of active connection object paths.
-      
Version -
-      s -
-      (read)

-        NetworkManager version.
-      
State -
-      u -
-      (read)
-      (NM_STATE)
-    

-        The overall state of the NetworkManager daemon.
-      
Enumerated types:
NM_STATE

-        Describes the overall state of the daemon.
-      
NM_STATE_UNKNOWN = 0

-          The NetworkManager daemon is in an unknown state.
-        
NM_STATE_ASLEEP = 1

-          The NetworkManager daemon is asleep and all interfaces managed by it are inactive.
-        
NM_STATE_CONNECTING = 2

-          The NetworkManager daemon is connecting a device.  FIXME: What does this mean when one device is active and another is connecting?
-        
NM_STATE_CONNECTED = 3

-          The NetworkManager daemon is connected.
-        
NM_STATE_DISCONNECTED = 4

-          The NetworkManager daemon is disconnected.
-        

-
-  
org.freedesktop.NetworkManager.AccessPoint
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Flags -
-      u -
-      (read)
-      (NM_802_11_AP_FLAGS)
-    
Flags describing the capabilities of the access point.
WpaFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
RsnFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
Ssid -
-      ay -
-      (read)
The Service Set Identifier identifying the access point.
Frequency -
-      u -
-      (read)
The radio channel frequency in use by the access point, in MHz.
HwAddress -
-      s -
-      (read)
The hardware address (BSSID) of the access point.
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    
Describes the operating mode of the access point.
MaxBitrate -
-      u -
-      (read)
The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
Strength -
-      y -
-      (read)
The current signal quality of the access point, in percent.
Sets of flags:
NM_802_11_AP_FLAGS

-        Flags describing the general capabilities of the access point.
-      
NM_802_11_AP_FLAGS_NONE = 0x0
Null capability - says nothing about the access point.
NM_802_11_AP_FLAGS_PRIVACY = 0x1
Access point supports privacy measures.
NM_802_11_AP_SEC

-        Flags describing the security capabilities of the access point.
-      
NM_802_11_AP_SEC_NONE = 0x0
Null flag.
NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
Access point supports pairwise 40-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
Access point supports pairwise 104-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_TKIP = 0x4
Access point supports pairwise TKIP encryption.
NM_802_11_AP_SEC_PAIR_CCMP = 0x8
Access point supports pairwise CCMP encryption.
NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
Access point supports a group 40-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
Access point supports a group 104-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_TKIP = 0x40
Access point supports a group TKIP cipher.
NM_802_11_AP_SEC_GROUP_CCMP = 0x80
Access point supports a group CCMP cipher.
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
Access point supports PSK key management.
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
Access point supports 802.1x key management.

-
-  
org.freedesktop.NetworkManager.Device
Methods:
Disconnect (
-        
-        ) →
-        nothing

-        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
-      
Signals:
StateChanged (
-        u: new_state, u: old_state, u: reason
-        )
Parameters
new_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The new state of the device.
-        
old_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The previous state of the device.
-        
reason -
-      u
-      (NM_DEVICE_STATE_REASON)
-    

-          A reason for the state transition.
-        
Properties:
Udi -
-      s -
-      (read)

-        Unique Device Identifier.
-      
Interface -
-      s -
-      (read)

-        The name of the device's control (and often data) interface.
-      
IpInterface -
-      s -
-      (read)

-        The name of the device's data interface when available.  This property
-        may not refer to the actual data interface until the device has
-        successfully established a data connection, indicated by the device's
-        State becoming ACTIVATED.
-      
Driver -
-      s -
-      (read)

-        The driver handling the device.
-      
Capabilities -
-      u -
-      (read)
-      (NM_DEVICE_CAP)
-    

-        Flags describing the capabilities of the device.
-      
Ip4Address -
-      i -
-      (read)

-        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
-      
State -
-      u -
-      (read)
-      (NM_DEVICE_STATE)
-    

-        The current state of the device.
-      
Ip4Config -
-      o -
-      (read)

-        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp4Config -
-      o -
-      (read)

-        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Ip6Config -
-      o -
-      (read)

-        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp6Config -
-      o -
-      (read)

-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server.  Only valid when the device is in the
-        NM_DEVICE_STATE_ACTIVATED state.
-      
Managed -
-      b -
-      (read)

-        Whether or not this device is managed by NetworkManager.
-      
FirmwareMissing -
-      b -
-      (read)

-        If TRUE, indicates the device is likely missing firmware necessary for
-        its operation.
-      
DeviceType -
-      u -
-      (read)
-      (NM_DEVICE_TYPE)
-    

-        The general type of the network device; ie Ethernet, WiFi, etc.
-      
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

-          The device is in an unknown state.
-        
NM_DEVICE_STATE_UNMANAGED = 1

-          The device is not managed by NetworkManager.
-        
NM_DEVICE_STATE_UNAVAILABLE = 2

-          The device cannot be used (carrier off, rfkill, etc).
-        
NM_DEVICE_STATE_DISCONNECTED = 3

-          The device is not connected.
-        
NM_DEVICE_STATE_PREPARE = 4

-          The device is preparing to connect.
-        
NM_DEVICE_STATE_CONFIG = 5

-          The device is being configured.
-        
NM_DEVICE_STATE_NEED_AUTH = 6

-          The device is awaiting secrets necessary to continue connection.
-        
NM_DEVICE_STATE_IP_CONFIG = 7

-          The IP settings of the device are being requested and configured.
-        
NM_DEVICE_STATE_ACTIVATED = 8

-          The device is active.
-        
NM_DEVICE_STATE_FAILED = 9

-          The device is in a failure state following an attempt to activate it.
-        
NM_DEVICE_TYPE
NM_DEVICE_TYPE_UNKNOWN = 0

-          The device type is unknown.
-        
NM_DEVICE_TYPE_ETHERNET = 1

-          The device is wired Ethernet device.
-        
NM_DEVICE_TYPE_WIFI = 2

-          The device is an 802.11 WiFi device.
-        
NM_DEVICE_TYPE_GSM = 3

-          The device is a GSM-based cellular WAN device.
-        
NM_DEVICE_TYPE_CDMA = 4

-          The device is a CDMA/IS-95-based cellular WAN device.
-        
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

-          The state change is normal.
-        
NM_DEVICE_STATE_REASON_NOW_MANAGED = 2

-          The device is now managed.
-        
NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3

-          The device is no longer managed.
-        
NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4

-          The device could not be readied for configuration.
-        
NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5

-          IP configuration could not be reserved (no available address, timeout, etc).
-        
NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6

-          The IP configuration is no longer valid.
-        
NM_DEVICE_STATE_REASON_NO_SECRETS = 7

-          Secrets were required, but not provided.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8

-          The 802.1X supplicant disconnected from the access point or authentication server.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9

-          Configuration of the 802.1X supplicant failed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10

-          The 802.1X supplicant quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11

-          The 802.1X supplicant took too long to authenticate.
-        
NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12

-          The PPP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13

-          The PPP service disconnected unexpectedly.
-        
NM_DEVICE_STATE_REASON_PPP_FAILED = 14

-          The PPP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15

-          The DHCP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_DHCP_ERROR = 16

-          The DHCP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_DHCP_FAILED = 17

-          The DHCP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18

-          The shared connection service failed to start.
-        
NM_DEVICE_STATE_REASON_SHARED_FAILED = 19

-          The shared connection service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20

-          The AutoIP service failed to start.
-        
NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21

-          The AutoIP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22

-          The AutoIP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_MODEM_BUSY = 23

-          Dialing failed because the line was busy.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24

-          Dialing failed because there was no dial tone.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25

-          Dialing failed because there was carrier.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26

-          Dialing timed out.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27

-          Dialing failed.
-        
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28

-          Modem initialization failed.
-        
NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29

-          Failed to select the specified GSM APN.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30

-          Not searching for networks.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31

-          Network registration was denied.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32

-          Network registration timed out.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33

-          Failed to register with the requested GSM network.
-        
NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34

-          PIN check failed.
-        
NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35

-          Necessary firmware for the device may be missing.
-        
NM_DEVICE_STATE_REASON_REMOVED = 36

-          The device was removed.
-        
NM_DEVICE_STATE_REASON_SLEEPING = 37

-          NetworkManager went to sleep.
-        
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38

-          The device's active connection was removed or disappeared.
-        
NM_DEVICE_STATE_REASON_USER_REQUESTED = 39

-          A user or client requested the disconnection.
-        
NM_DEVICE_STATE_REASON_CARRIER = 40

-          The device's carrier/link changed.
-        
NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41

-          The device's existing connection was assumed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42

-          The 802.1x supplicant is now available.
-        
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43

-          The modem could not be found.
-        
NM_DEVICE_STATE_REASON_BT_FAILED = 44

-          The Bluetooth connection timed out or failed.
-        
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.

-
-  
org.freedesktop.NetworkManager.Device.Wired
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
HwAddress -
-      s -
-      (read)

-        Active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        Permanent hardware address of the device.
-      
Speed -
-      u -
-      (read)

-        Design speed of the device, in megabits/second (Mb/s).
-      
Carrier -
-      b -
-      (read)

-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      

-
-  
org.freedesktop.NetworkManager.Device.Wireless
Methods:
GetAccessPoints (
-        
-        ) →
-        ao

-        Get the list of access points visible to this device.
-      
Returns
access_points -
-      ao

-          List of access point object paths
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
AccessPointAdded (
-        o: access_point
-        )

-            Emitted when a new access point is found by the device.
-        
Parameters
access_point -
-      o

-                The object path of the newly found access point.
-            
AccessPointRemoved (
-        o: access_point
-        )

-            Emitted when an access point disappears from view of the device.
-        
Parameters
access_point -
-      o

-                The object path of the access point that has disappeared.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        The permanent hardware address of the device.
-      
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    

-        The operating mode of the wireless device.
-      
Bitrate -
-      u -
-      (read)

-        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      
ActiveAccessPoint -
-      o -
-      (read)

-        Object path of the access point currently used by the wireless device.
-      
WirelessCapabilities -
-      u -
-      (read)
-      (NM_802_11_DEVICE_CAP)
-    

-        The capabilities of the wireless device.
-      
Sets of flags:
NM_802_11_DEVICE_CAP

-        Flags describing the capabilities of a wireless device.
-      
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.

-
-  
org.freedesktop.NetworkManager.Device.Cdma
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Interface has no properties.

-
-  
org.freedesktop.NetworkManager.Device.Gsm
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Interface has no properties.

-
-  
org.freedesktop.NetworkManager.Device.Serial
Interface has no methods.
Signals:
PppStats (
-        u: in_bytes, u: out_bytes
-        )
Parameters
in_bytes -
-      u

-	Bytes received
-      
out_bytes -
-      u

-	Bytes sent
-      
Interface has no properties.

-
-  
org.freedesktop.NetworkManager.Device.Bluetooth
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
HwAddress -
-      s -
-      (read)

-        Bluetooth hardware address of the device.
-      
Name -
-      s -
-      (read)

-        Bluetooth name of the device.
-      
BtCapabilities -
-      u -
-      (read)
-      (NM_BT_CAPABILITIES)
-    

-        Bluetooth capabilities of the device (either DUN or NAP).
-      
Sets of flags:
NM_BT_CAPABILITIES

-        Flags describing the capabilities of a Bluetooth device.
-      
NM_BT_CAPABILITY_NONE = 0x0
The device has no recognized capabilities.
NM_BT_CAPABILITY_DUN = 0x1
The device supports Bluetooth Dial-Up Networking.
NM_BT_CAPABILITY_PAN = 0x2
The device supports Bluetooth Personal Area Networking.

-
-  
org.freedesktop.NetworkManager.Device.OlpcMesh
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The hardware address of the device.
-      
Companion -
-      o -
-      (read)

-        The object path of the companion device.
-      
ActiveChannel -
-      u -
-      (read)

-        The currently active channel.
-      

-
-  
org.freedesktop.NetworkManager.IP4Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
-      aau -
-      (read)
Array of tuples of IPv4 address/prefix/gateway.  All 3
-      elements of each tuple are in network byte order.  Essentially:
-      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
-      
Nameservers -
-      au -
-      (read)
The nameservers in use.
WinsServers -
-      au -
-      (read)
The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Routes -
-      aau -
-      (read)
Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
-      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
-      addresses, while prefix and metric are simple unsigned integers.  Essentially:
-      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
-      

-
-  
org.freedesktop.NetworkManager.IP6Config
Interface has no methods.
Interface has no signals.
Properties:
Addresses -
-      a(ayuay) -
-      (read)
Tuples of IPv6 address/prefix/gateway.
Nameservers -
-      aay -
-      (read)
The nameservers in use.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Routes -
-      a(ayuayu) -
-      (read)
Tuples of IPv6 route/prefix/next-hop/metric.

-
-    
org.freedesktop.NetworkManager.DHCP4Config

-            Options and configuration returned by the IPv4 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-    
org.freedesktop.NetworkManager.DHCP6Config

-            Options and configuration returned by the IPv6 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-  
org.freedesktop.NetworkManagerSettings

-      The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
-    
Methods:
ListConnections (
-        
-        ) →
-        ao

-        List the connections stored by this Settings object.
-      
Returns
connections -
-      ao

-          List of connections.
-        
AddConnection (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Add new connection.
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties.
-        
Signals:
NewConnection (
-        o: connection
-        )

-        Emitted when a new connection has been added.
-      
Parameters
connection -
-      o

-          Object path of the new connection.
-        
Interface has no properties.

-
-  
org.freedesktop.NetworkManagerSettings.System

-      Implemented by the system settings service to provide additional settings to NetworkManager.
-    
Methods:
SaveHostname (
-        s: hostname
-        ) →
-        nothing

-        Save the hostname to persistent configuration.
-      
Parameters
hostname -
-      s

-          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        
GetPermissions (
-        
-        ) →
-        u

-        Returns a bitfield indicating certain operations the caller is permitted to perform.  Some of these operations may require authorization by the user.
-      
Returns
permissions -
-      u
-      (NM_SETTINGS_SYSTEM_PERMISSIONS)
-    

-          A bitfield of permitted operations.  Some of these operations may require the user to authorize via password entry or other means.
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
CheckPermissions (
-        
-        )

-        Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions.
-      
Properties:
Hostname -
-      s -
-      (read)

-        The machine hostname stored in persistent configuration.
-      
CanModify -
-      b -
-      (read)

-        If true, adding and modifying connections is supported.
-      
Sets of flags:
NM_SETTINGS_SYSTEM_PERMISSIONS
NM_SETTINGS_SYSTEM_PERMISSION_NONE = 0x0
No permissions.
NM_SETTINGS_SYSTEM_PERMISSION_CONNECTION_MODIFY = 0x1
Can modify/add/delete connections.
NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARING_PROTECTED = 0x2
Can share connections via a encrypted user-created WiFi network.
NM_SETTINGS_SYSTEM_PERMISSION_WIFI_SHARING_OPEN = 0x4
Can share connections via a open/unencrypted user-created WiFi network.
NM_SETTINGS_SYSTEM_PERMISSION_HOSTNAME_MODIFY = 0x8
Can modify the persistent system hostname.

-
-
-    
org.freedesktop.NetworkManagerSettings.Connection

-            Represents a single network connection configuration.
-        
Methods:
Update (
-        a{sa{sv}}: properties
-        ) →
-        nothing

-            Update the connection with new settings and properties, replacing all previous settings and properties.
-          
Parameters
properties -
-      a{sa{sv}}

-              New connection properties.
-            
Delete (
-        
-        ) →
-        nothing

-            Delete the connection.
-          
GetSettings (
-        
-        ) →
-        a{sa{sv}}

-                Get the settings maps describing this object.
-            
Returns
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    The nested settings maps describing this object.
-                
Signals:
Updated (
-        a{sa{sv}}: settings
-        )

-                Emitted when some settings changed.
-            
Parameters
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Contains complete connection setting parameters, including changes.
-                
Removed (
-        
-        )

-                Emitted when this connection has been deleted/removed.  After receipt of this signal, the object no longer exists.
-            
Interface has no properties.

-
-    
org.freedesktop.NetworkManagerSettings.Connection.Secrets

-            Secrets have a separate interface so that they can be locked down.
-        
Methods:
GetSecrets (
-        s: setting_name, as: hints, b: request_new
-        ) →
-        a{sa{sv}}

-                Get the secrets encapsulated in this object.
-            
Parameters
setting_name -
-      s

-                    Name of the setting to return.
-                
hints -
-      as

-                    Array of strings of key names in the Setting for which NM thinks
-                    a secrets may be required.
-                
request_new -
-      b

-                    Indicates whether new secrets should be requested or if the request can be fulfilled from storage.
-                
Returns
secrets -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing secrets.  Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.
-                
Interface has no signals.
Interface has no properties.

-
-
-  
org.freedesktop.NetworkManager.Connection.Active
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
ServiceName -
-      s -
-      (read)
The D-Bus service name providing this connection.
Connection -
-      o -
-      (read)
The path of the connection.
SpecificObject -
-      o -
-      (read)
A specific object associated with the active connection.
Devices -
-      ao -
-      (read)
Array of object paths representing devices which are part of this active connection.
State -
-      u -
-      (read)
-      (NM_ACTIVE_CONNECTION_STATE)
-    
The state of this active connection.
Default -
-      b -
-      (read)
Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.
Default6 -
-      b -
-      (read)
Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.
Vpn -
-      b -
-      (read)
Whether this active connection is also a VPN connection.
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

-          The active connection is in an unknown state.
-        
NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1

-          The connection is activating.
-        
NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2

-          The connection is activated.
-        

-
-  
org.freedesktop.NetworkManager.VPN.Connection

-      Represents an active connection to a Virtual Private Network.
-    
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
VpnStateChanged (
-        u: state, u: reason
-        )

-        Emitted when the state of the VPN connection has changed.
-      
Parameters
state -
-      u
-      (NM_VPN_CONNECTION_STATE)
-    

-          The new state of the VPN connection.
-        
reason -
-      u
-      (NM_VPN_CONNECTION_STATE_REASON)
-    

-          Reason code describing the change to the new state.
-        
Properties:
VpnState -
-      u -
-      (read)
-      (NM_VPN_CONNECTION_STATE)
-    
The VPN-specific state of the connection.
Banner -
-      s -
-      (read)
The banner string of the VPN connection.
Enumerated types:
NM_VPN_CONNECTION_STATE
NM_VPN_CONNECTION_STATE_UNKNOWN = 0

-          The state of the VPN connection is unknown.
-        
NM_VPN_CONNECTION_STATE_PREPARE = 1

-          The VPN connection is preparing to connect.
-        
NM_VPN_CONNECTION_STATE_NEED_AUTH = 2

-          The VPN connection needs authorization credentials.
-        
NM_VPN_CONNECTION_STATE_CONNECT = 3

-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4

-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        
NM_VPN_CONNECTION_STATE_ACTIVATED = 5

-          The VPN connection is active.
-        
NM_VPN_CONNECTION_STATE_FAILED = 6

-          The VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_DISCONNECTED = 7

-          The VPN connection is disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0

-          The reason for the VPN connection state change is unknown.
-        
NM_VPN_CONNECTION_STATE_REASON_NONE = 1

-          No reason was given for the VPN connection state change.
-        
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2

-          The VPN connection changed state because the user disconnected it.
-        
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3

-          The VPN connection changed state because the device it was using was disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4

-          The service providing the VPN connection was stopped.
-        
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5

-          The IP config of the VPN connection was invalid.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6

-          The connection attempt to the VPN service timed out.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7

-          A timeout occurred while starting the service providing the VPN connection.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8

-          Starting the service starting the service providing the VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9

-          Necessary secrets for the VPN connection were not provided.
-        
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10

-          Authentication to the VPN server failed.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11

-          The connection was deleted from settings.
-        

-
-  
org.freedesktop.NetworkManager.VPN.Plugin

-      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    
Methods:
Connect (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Tells the plugin to connect.
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection to be established.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.(generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.(generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.(generic description)
NeedSecrets (
-        a{sa{sv}}: settings
-        ) →
-        s

-        Asks the plugin whether the provided connection will require secrets to connect successfully.
-      
Parameters
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection that may need secrets.
-        
Returns
setting_name -
-      s

-          The setting name within the provided connection that requires secrets, if any.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.(generic description)
Disconnect (
-        
-        ) →
-        nothing

-        Disconnect the plugin.
-      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetIp4Config (
-        a{sv}: config
-        ) →
-        nothing

-        Set IPv4 details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Ip4Config details for the conneciton.
-        
SetFailure (
-        s: reason
-        ) →
-        nothing

-        Indicate a failure to the plugin.
-      
Parameters
reason -
-      s

-          The reason for the failure.
-        
Signals:
StateChanged (
-        u: state
-        )

-        Emitted when the plugin state changes.
-      
Parameters
state -
-      u
-      (NM_VPN_CONNECTION_STATE)
-    

-          The new state of the plugin.
-        
Ip4Config (
-        a{sv}: ip4config
-        )

-        The plugin obtained an IPv4 configuration.
-      
Parameters
ip4config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The IPv4 configuration.
-        
LoginBanner (
-        s: banner
-        )

-        Emitted when the plugin receives a login banner from the VPN service.
-      
Parameters
banner -
-      s

-          The login banner string.
-        
Failure (
-        u: reason
-        )

-        Emitted when a failure in the VPN plugin occurs.
-      
Parameters
reason -
-      u
-      (NM_VPN_PLUGIN_FAILURE)
-    

-          Reason code for the failure.
-        
Properties:
State -
-      u -
-      (read)
-      (NM_VPN_CONNECTION_STATE)
-    

-        The state of the plugin.
-      
Enumerated types:
NM_VPN_PLUGIN_FAILURE
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0

-          Login failed.
-        
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1

-          Connect failed.
-        
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

-          Invalid IP configuration returned from the VPN plugin.
-        

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1
Uncoordinated network without central infrastructure.
NM_802_11_MODE_INFRA = 2
Coordinated network with one or more central controllers.
Mapping types:
String_Variant_Map - a{
-        s: Key → v: Value
-        }
-      
A mapping from strings to variants representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      v
(undocumented)
String_String_Map - a{
-        s: Key → s: Value
-        }
-      
A mapping from strings to strings representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      s
(undocumented)
String_String_Variant_Map_Map - a{
-        s: Key → a{sv}: Value
-        }
-      
A mapping from strings to a map of string to variant.
Members
Key -
-      s
(undocumented)
Value -
-      a{sv}
-      (String_Variant_Map)
-    
(undocumented)
Errors:

-  
-
-  
org.freedesktop.NetworkManager.Error.UnknownConnection

-        Connection was not provided by any known settings service.
-    
-
-  
org.freedesktop.NetworkManager.Error.UnknownDevice

-        Unknown device.
-    
-
-  
org.freedesktop.NetworkManager.Error.InvalidService

-        Invalid settings service (not a recognized system or user settings service name).
-    
-
-  
org.freedesktop.NetworkManager.Error.SystemConnection

-        Connection was superseded by a system connection.
-    
-
-  
org.freedesktop.NetworkManager.Error.PermissionDenied

-    User does not have the permission to activate this connection.
-    
-
-
Errors:

-  
org.freedesktop.NetworkManager.VPN.Error.General
This is a drab, nondescript error.
-  
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress
The request could not be processed because the VPN connection is already being started.
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted
The request could not be processed because a VPN connection was already active.
-  
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.
-  
org.freedesktop.NetworkManager.VPN.Error.WrongState
The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general?
-  
org.freedesktop.NetworkManager.VPN.Error.BadArguments
Invalid arguments were passed with the request.  FIXME: too general.
-  
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
-  
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

-- 
cgit 1.3.0-6-gf8a5