From a4256940da049f91bbbea5e53e469a59ea9c10f7 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 25 Oct 2013 21:20:58 +0200 Subject: Imported Upstream version 0.9.8.8 --- docs/Makefile.am | 5 +- docs/Makefile.in | 271 +-- docs/api/Makefile.am | 35 +- docs/api/Makefile.in | 664 ++++--- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 40 +- docs/api/html/ix01.html | 10 +- docs/api/html/license.html | 10 +- docs/api/html/ref-dbus.html | 10 +- docs/api/html/ref-migrating.html | 74 +- docs/api/html/ref-settings.html | 84 +- docs/api/html/secrets-flags.html | 8 +- docs/api/html/spec.html | 95 +- docs/api/settings-spec.xml | 1604 +++++++++++++++ docs/api/spec.html | 95 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 207 +- docs/libnm-glib/html/NMAccessPoint.html | 377 ++-- docs/libnm-glib/html/NMActiveConnection.html | 251 +-- docs/libnm-glib/html/NMClient.html | 1198 +++++++---- docs/libnm-glib/html/NMDHCP4Config.html | 70 +- docs/libnm-glib/html/NMDHCP6Config.html | 70 +- docs/libnm-glib/html/NMDevice.html | 838 ++++---- docs/libnm-glib/html/NMDeviceAdsl.html | 136 +- docs/libnm-glib/html/NMDeviceBond.html | 182 +- docs/libnm-glib/html/NMDeviceBridge.html | 182 +- docs/libnm-glib/html/NMDeviceBt.html | 164 +- docs/libnm-glib/html/NMDeviceEthernet.html | 173 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 161 +- docs/libnm-glib/html/NMDeviceModem.html | 140 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 196 +- docs/libnm-glib/html/NMDeviceVlan.html | 178 +- docs/libnm-glib/html/NMDeviceWifi.html | 338 ++-- docs/libnm-glib/html/NMDeviceWimax.html | 329 +-- docs/libnm-glib/html/NMIP4Config.html | 120 +- docs/libnm-glib/html/NMIP6Config.html | 114 +- docs/libnm-glib/html/NMObject.html | 133 +- docs/libnm-glib/html/NMRemoteConnection.html | 140 +- docs/libnm-glib/html/NMRemoteSettings.html | 430 ++-- docs/libnm-glib/html/NMSecretAgent.html | 494 ++--- docs/libnm-glib/html/NMVPNConnection.html | 106 +- docs/libnm-glib/html/NMWimaxNsp.html | 246 ++- docs/libnm-glib/html/annotation-glossary.html | 80 +- docs/libnm-glib/html/api-index-full.html | 94 +- docs/libnm-glib/html/ch02.html | 14 +- docs/libnm-glib/html/index.html | 14 +- docs/libnm-glib/html/index.sgml | 560 +++--- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 189 +- docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 388 ++++ .../html/libnm-glib-NMVpnPluginUiWidget.html | 382 ---- docs/libnm-glib/html/libnm-glib-nm-types.html | 6 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 96 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 532 ++--- docs/libnm-glib/html/object-tree.html | 10 +- docs/libnm-glib/html/ref-overview.html | 10 +- docs/libnm-glib/libnm-glib-sections.txt | 507 +++-- docs/libnm-glib/tmpl/libnm_glib.sgml | 24 - docs/libnm-glib/tmpl/nm-access-point.sgml | 114 +- docs/libnm-glib/tmpl/nm-active-connection.sgml | 90 +- docs/libnm-glib/tmpl/nm-client.sgml | 316 ++- docs/libnm-glib/tmpl/nm-device-adsl.sgml | 54 +- docs/libnm-glib/tmpl/nm-device-bond.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-bridge.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-bt.sgml | 72 +- docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 76 +- docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 62 +- docs/libnm-glib/tmpl/nm-device-modem.sgml | 54 +- docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-vlan.sgml | 72 +- docs/libnm-glib/tmpl/nm-device-wifi.sgml | 130 +- docs/libnm-glib/tmpl/nm-device-wimax.sgml | 128 +- docs/libnm-glib/tmpl/nm-device.sgml | 248 +-- docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 12 +- docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 12 +- docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 24 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 20 +- docs/libnm-glib/tmpl/nm-ip6-config.sgml | 18 +- docs/libnm-glib/tmpl/nm-object.sgml | 60 +- docs/libnm-glib/tmpl/nm-remote-connection.sgml | 36 +- docs/libnm-glib/tmpl/nm-remote-settings.sgml | 142 +- docs/libnm-glib/tmpl/nm-secret-agent.sgml | 148 +- docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 38 +- .../tmpl/nm-vpn-plugin-ui-interface.sgml | 106 +- docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 16 +- docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 82 +- docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 58 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 207 +- docs/libnm-util/html/NMConnection.html | 1362 +++++++------ docs/libnm-util/html/NMSetting.html | 1042 +++++----- docs/libnm-util/html/NMSetting8021x.html | 2098 +++++++++++--------- docs/libnm-util/html/NMSettingAdsl.html | 246 ++- docs/libnm-util/html/NMSettingBluetooth.html | 137 +- docs/libnm-util/html/NMSettingBond.html | 283 +-- docs/libnm-util/html/NMSettingBridge.html | 244 ++- docs/libnm-util/html/NMSettingBridgePort.html | 164 +- docs/libnm-util/html/NMSettingCdma.html | 163 +- docs/libnm-util/html/NMSettingConnection.html | 588 +++--- docs/libnm-util/html/NMSettingGsm.html | 586 +++--- docs/libnm-util/html/NMSettingIP4Config.html | 1389 +++++++------ docs/libnm-util/html/NMSettingIP6Config.html | 1439 ++++++++------ docs/libnm-util/html/NMSettingInfiniband.html | 134 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 128 +- docs/libnm-util/html/NMSettingPPP.html | 441 ++-- docs/libnm-util/html/NMSettingPPPOE.html | 187 +- docs/libnm-util/html/NMSettingSerial.html | 172 +- docs/libnm-util/html/NMSettingVPN.html | 486 +++-- docs/libnm-util/html/NMSettingVlan.html | 515 ++--- docs/libnm-util/html/NMSettingWimax.html | 141 +- docs/libnm-util/html/NMSettingWired.html | 391 ++-- docs/libnm-util/html/NMSettingWireless.html | 565 +++--- .../libnm-util/html/NMSettingWirelessSecurity.html | 853 ++++---- docs/libnm-util/html/annotation-glossary.html | 67 +- docs/libnm-util/html/api-index-full.html | 18 +- docs/libnm-util/html/ch01.html | 12 +- docs/libnm-util/html/index.html | 12 +- docs/libnm-util/html/index.sgml | 1154 +++++------ docs/libnm-util/html/libnm-util-nm-utils.html | 1314 ++++++------ docs/libnm-util/html/libnm-util.devhelp2 | 1102 +++++----- docs/libnm-util/html/object-tree.html | 10 +- docs/libnm-util/libnm-util-sections.txt | 1062 +++++----- docs/libnm-util/tmpl/nm-connection.sgml | 228 +-- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 446 +++-- docs/libnm-util/tmpl/nm-setting-adsl.sgml | 108 +- docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-bond.sgml | 76 +- docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 66 +- docs/libnm-util/tmpl/nm-setting-bridge.sgml | 100 +- docs/libnm-util/tmpl/nm-setting-cdma.sgml | 78 +- docs/libnm-util/tmpl/nm-setting-connection.sgml | 164 +- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 180 +- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 336 ++-- docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 342 ++-- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-ppp.sgml | 186 +- docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 74 +- docs/libnm-util/tmpl/nm-setting-private.sgml | 6 +- docs/libnm-util/tmpl/nm-setting-serial.sgml | 82 +- docs/libnm-util/tmpl/nm-setting-vlan.sgml | 144 +- docs/libnm-util/tmpl/nm-setting-vpn.sgml | 124 +- docs/libnm-util/tmpl/nm-setting-wimax.sgml | 48 +- docs/libnm-util/tmpl/nm-setting-wired.sgml | 146 +- .../tmpl/nm-setting-wireless-security.sgml | 252 +-- docs/libnm-util/tmpl/nm-setting-wireless.sgml | 182 +- docs/libnm-util/tmpl/nm-setting.sgml | 214 +- docs/libnm-util/tmpl/nm-utils.sgml | 210 +- docs/libnm-util/version.xml | 2 +- 148 files changed, 21341 insertions(+), 16671 deletions(-) create mode 100644 docs/api/settings-spec.xml create mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html delete mode 100644 docs/libnm-glib/tmpl/libnm_glib.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-glib-marshal.sgml (limited to 'docs') diff --git a/docs/Makefile.am b/docs/Makefile.am index ee889220..fd2c82c8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,2 @@ -if ENABLE_DOC +SUBDIRS = libnm-glib libnm-util api -SUBDIRS = api libnm-glib libnm-util - -endif diff --git a/docs/Makefile.in b/docs/Makefile.in index 6eb2b23c..71584bae 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,12 +127,32 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = api libnm-glib libnm-util +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -266,7 +320,6 @@ 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@ @@ -281,6 +334,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -362,7 +417,7 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -@ENABLE_DOC_TRUE@SUBDIRS = api libnm-glib libnm-util +SUBDIRS = libnm-glib libnm-util api all: all-recursive .SUFFIXES: @@ -404,22 +459,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -434,57 +492,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -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: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -500,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - 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; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -517,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(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; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -534,6 +538,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -694,22 +713,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - 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 +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am 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-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 98dd3de7..3ca46033 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -1,7 +1,5 @@ AUTOMAKE_OPTIONS = 1.7 -if ENABLE_DOC - XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) @@ -15,21 +13,24 @@ OTHER_FILES= \ GENERATED_FILES = spec.html settings-spec.xml +if ENABLE_GTK_DOC + spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp - $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ + $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html mkdir -p $(builddir)/html/ - cp $@ $(builddir)/html/ + cp spec.html $(builddir)/html/ -# settings-spec.xml should *not* be DISTed because it must be regenerated -# whenever the libnm-util source changes settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la - $(top_builddir)/tools/generate-settings-spec book $@ + rm -f $(builddir)/settings-spec.xml + $(top_builddir)/tools/generate-settings-spec book $(builddir)/settings-spec.xml + +all: $(GENERATED_FILES) + +endif # Top-level SGML file includes (depends on) settings-spec.xml $(DOC_MAIN_SGML_FILE): settings-spec.xml -all: $(GENERATED_FILES) - #################################### # The name of the module. @@ -56,17 +57,9 @@ include $(top_srcdir)/gtk-doc.make #################################### -EXTRA_DIST += spec.html -CLEANFILES += $(GENERATED_FILES) - -else - -EXTRA_DIST = -CLEANFILES = - -endif - -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in $(GENERATED_FILES) CLEANFILES += html/* tmpl/* xml/* \ NetworkManager-sections.txt \ - NetworkManager-overrides.txt + NetworkManager-overrides.txt \ + $(GENERATED_FILES) + diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index caa59cfd..a9ee52e0 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -78,12 +105,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -91,6 +124,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -233,7 +267,6 @@ 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@ @@ -248,6 +281,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -330,91 +365,122 @@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ AUTOMAKE_OPTIONS = 1.7 -@ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@ENABLE_DOC_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -@ENABLE_DOC_TRUE@OTHER_FILES = \ -@ENABLE_DOC_TRUE@ $(top_builddir)/introspection/all.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/errors.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml - -@ENABLE_DOC_TRUE@GENERATED_FILES = spec.html settings-spec.xml +XSLTPROC = xsltproc --xinclude --nonet +XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) +OTHER_FILES = \ + $(top_builddir)/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 #################################### # The name of the module. -@ENABLE_DOC_TRUE@DOC_MODULE = NetworkManager +DOC_MODULE = NetworkManager # The top-level SGML file. -@ENABLE_DOC_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml -@ENABLE_DOC_TRUE@DOC_SOURCE_DIR = $(srcdir) +DOC_MAIN_SGML_FILE = network-manager-docs.xml +DOC_SOURCE_DIR = $(srcdir) # Extra options to supply to gtkdoc-mkdb -@ENABLE_DOC_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml +MKDB_OPTIONS = --sgml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl -@ENABLE_DOC_TRUE@MKTMPL_OPTIONS = +MKTMPL_OPTIONS = # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -@ENABLE_DOC_TRUE@content_files = \ -@ENABLE_DOC_TRUE@ version.xml \ -@ENABLE_DOC_TRUE@ migrating-to-09.xml \ -@ENABLE_DOC_TRUE@ $(NULL) - -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute +content_files = \ + version.xml \ + migrating-to-09.xml \ + $(NULL) + +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_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. # -@ENABLE_DOC_TRUE@GPATH = $(srcdir) -@ENABLE_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -@ENABLE_DOC_TRUE@SETUP_FILES = \ -@ENABLE_DOC_TRUE@ $(content_files) \ -@ENABLE_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-overrides.txt +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt -@ENABLE_DOC_FALSE@EXTRA_DIST = version.xml.in #################################### -@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) spec.html \ -@ENABLE_DOC_TRUE@ version.xml.in -@ENABLE_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ -@ENABLE_DOC_TRUE@ html-build.stamp pdf-build.stamp \ -@ENABLE_DOC_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp - -@ENABLE_DOC_TRUE@SCANOBJ_FILES = \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).args \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).hierarchy \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).interfaces \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).prerequisites \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).signals - -@ENABLE_DOC_TRUE@REPORT_FILES = \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undocumented.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undeclared.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-unused.txt - -@ENABLE_DOC_FALSE@CLEANFILES = html/* tmpl/* xml/* \ -@ENABLE_DOC_FALSE@ NetworkManager-sections.txt \ -@ENABLE_DOC_FALSE@ NetworkManager-overrides.txt -@ENABLE_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ -@ENABLE_DOC_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* \ -@ENABLE_DOC_TRUE@ tmpl/* xml/* NetworkManager-sections.txt \ -@ENABLE_DOC_TRUE@ NetworkManager-overrides.txt -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \ + $(GENERATED_FILES) +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + tmpl.stamp sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) html/* \ + tmpl/* xml/* NetworkManager-sections.txt \ + NetworkManager-overrides.txt $(GENERATED_FILES) +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -457,13 +523,12 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: -@ENABLE_DOC_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -500,7 +565,6 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -@ENABLE_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -534,11 +598,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOC_FALSE@uninstall-local: -@ENABLE_DOC_FALSE@distclean-local: -@ENABLE_DOC_FALSE@install-data-local: -@ENABLE_DOC_FALSE@maintainer-clean-local: -@ENABLE_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -609,245 +668,222 @@ uninstall-am: uninstall-local .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local 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 \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local - - -@ENABLE_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@ENABLE_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ -@ENABLE_DOC_TRUE@ mkdir -p $(builddir)/html/ -@ENABLE_DOC_TRUE@ cp $@ $(builddir)/html/ - -# settings-spec.xml should *not* be DISTed because it must be regenerated -# whenever the libnm-util source changes -@ENABLE_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la -@ENABLE_DOC_TRUE@ $(top_builddir)/tools/generate-settings-spec book $@ - -# Top-level SGML file includes (depends on) settings-spec.xml -@ENABLE_DOC_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml - -@ENABLE_DOC_TRUE@all: $(GENERATED_FILES) - -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@all-local: - -@ENABLE_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -@ENABLE_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -#### setup #### -@ENABLE_DOC_TRUE@setup-build.stamp: -@ENABLE_DOC_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ echo ' DOC Preparing build'; \ -@ENABLE_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ -@ENABLE_DOC_TRUE@ if test "x$$files" != "x" ; then \ -@ENABLE_DOC_TRUE@ for file in $$files ; do \ -@ENABLE_DOC_TRUE@ test -f $(abs_srcdir)/$$file && \ -@ENABLE_DOC_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ test -d $(abs_srcdir)/tmpl && \ -@ENABLE_DOC_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ -@ENABLE_DOC_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch setup-build.stamp +@ENABLE_GTK_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp +@ENABLE_GTK_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html +@ENABLE_GTK_DOC_TRUE@ mkdir -p $(builddir)/html/ +@ENABLE_GTK_DOC_TRUE@ cp spec.html $(builddir)/html/ -#### scan #### +@ENABLE_GTK_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la +@ENABLE_GTK_DOC_TRUE@ rm -f $(builddir)/settings-spec.xml +@ENABLE_GTK_DOC_TRUE@ $(top_builddir)/tools/generate-settings-spec book $(builddir)/settings-spec.xml -@ENABLE_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_DOC_TRUE@ @echo ' DOC Scanning header files' -@ENABLE_DOC_TRUE@ @_source_dir='' ; \ -@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_DOC_TRUE@ done ; \ -@ENABLE_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@ENABLE_DOC_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@ENABLE_DOC_TRUE@ echo " DOC Introspecting gobjects"; \ -@ENABLE_DOC_TRUE@ scanobj_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ scanobj_options="--verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ -@ENABLE_DOC_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@ENABLE_DOC_TRUE@ test -f $$i || touch $$i ; \ -@ENABLE_DOC_TRUE@ done \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch scan-build.stamp - -@ENABLE_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp -@ENABLE_DOC_TRUE@ @true +@ENABLE_GTK_DOC_TRUE@all: $(GENERATED_FILES) -#### templates #### +# Top-level SGML file includes (depends on) settings-spec.xml +$(DOC_MAIN_SGML_FILE): settings-spec.xml -@ENABLE_DOC_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_DOC_TRUE@ @echo ' DOC Rebuilding template files' -@ENABLE_DOC_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ if test -w $(abs_srcdir) ; then \ -@ENABLE_DOC_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ -@ENABLE_DOC_TRUE@ fi \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch tmpl-build.stamp +@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_GTK_DOC_FALSE@all-local: -@ENABLE_DOC_TRUE@tmpl.stamp: tmpl-build.stamp -@ENABLE_DOC_TRUE@ @true +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_DOC_TRUE@$(srcdir)/tmpl/*.sgml: -@ENABLE_DOC_TRUE@ @true +$(REPORT_FILES): sgml-build.stamp -#### xml #### +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + 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 -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + test -d $(abs_srcdir)/tmpl && \ + { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + chmod -R u+w $(abs_builddir)/tmpl; } \ + fi + $(AM_V_at)touch setup-build.stamp + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp -@ENABLE_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building XML' -@ENABLE_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_DOC_TRUE@ @_source_dir='' ; \ -@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_DOC_TRUE@ done ; \ -@ENABLE_DOC_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) -@ENABLE_DOC_TRUE@ @touch sgml-build.stamp +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true -@ENABLE_DOC_TRUE@sgml.stamp: sgml-build.stamp -@ENABLE_DOC_TRUE@ @true +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + if test -w $(abs_srcdir) ; then \ + cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + fi \ + fi + $(AM_V_at)touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +$(srcdir)/tmpl/*.sgml: + @true + +sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + 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) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + 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; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp -#### html #### +############## -@ENABLE_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building HTML' -@ENABLE_DOC_TRUE@ @rm -rf html -@ENABLE_DOC_TRUE@ @mkdir html -@ENABLE_DOC_TRUE@ @mkhtml_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@ENABLE_DOC_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ -@ENABLE_DOC_TRUE@ for file in $(HTML_IMAGES) ; do \ -@ENABLE_DOC_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ -@ENABLE_DOC_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ if test -f $(abs_builddir)/$$file ; then \ -@ENABLE_DOC_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ done; -@ENABLE_DOC_TRUE@ @echo ' DOC Fixing cross-references' -@ENABLE_DOC_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@ENABLE_DOC_TRUE@ @touch html-build.stamp +clean-local: + @rm -f *~ *.bak + @rm -rf .libs -#### pdf #### +distclean-local: + @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 -@ENABLE_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building PDF' -@ENABLE_DOC_TRUE@ @rm -f $(DOC_MODULE).pdf -@ENABLE_DOC_TRUE@ @mkpdf_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ -@ENABLE_DOC_TRUE@ for img in $(HTML_IMAGES); do \ -@ENABLE_DOC_TRUE@ part=`dirname $$img`; \ -@ENABLE_DOC_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ -@ENABLE_DOC_TRUE@ if test $$? != 0; then \ -@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@ENABLE_DOC_TRUE@ @touch pdf-build.stamp +maintainer-clean-local: + @rm -rf xml html -############## +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi -@ENABLE_DOC_TRUE@clean-local: -@ENABLE_DOC_TRUE@ @rm -f *~ *.bak -@ENABLE_DOC_TRUE@ @rm -rf .libs - -@ENABLE_DOC_TRUE@distclean-local: -@ENABLE_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt -@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ -@ENABLE_DOC_TRUE@ rm -rf tmpl; \ -@ENABLE_DOC_TRUE@ fi - -@ENABLE_DOC_TRUE@maintainer-clean-local: clean -@ENABLE_DOC_TRUE@ @rm -rf xml html - -@ENABLE_DOC_TRUE@install-data-local: -@ENABLE_DOC_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ -@ENABLE_DOC_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ -@ENABLE_DOC_TRUE@ then echo 1>&2 'Nothing to install' ; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ $(mkinstalldirs) $${installdir} ; \ -@ENABLE_DOC_TRUE@ for i in $$installfiles; do \ -@ENABLE_DOC_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ -@ENABLE_DOC_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -@ENABLE_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -@ENABLE_DOC_TRUE@ fi - -@ENABLE_DOC_TRUE@uninstall-local: -@ENABLE_DOC_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ rm -rf $${installdir} +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} # # Require gtk-doc when making dist # -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @false - -@ENABLE_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@ENABLE_DOC_TRUE@ @mkdir $(distdir)/tmpl -@ENABLE_DOC_TRUE@ @mkdir $(distdir)/html -@ENABLE_DOC_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl -@ENABLE_DOC_TRUE@ @cp ./html/* $(distdir)/html -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ -@ENABLE_DOC_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) -@ENABLE_DOC_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -@ENABLE_DOC_TRUE@.PHONY : dist-hook-local docs +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc dist-hook-local + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.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. diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 1b7a72cf..79421726 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index d9d82eb4..aab8e218 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -3,10 +3,10 @@ NetworkManager D-Bus Reference Manual - + - + @@ -14,11 +14,11 @@
-

Version 0.9.8.0 +

Version 0.9.8.8

Copyright © 2012 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 @@ -42,29 +42,29 @@

-
+
D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
@@ -73,6 +73,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 00ffafd6..ae39f850 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -3,12 +3,12 @@ Index - + - + @@ -20,12 +20,12 @@ Next
-

-Index

+

+Index

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index e23a9d15..6cd55c46 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -3,11 +3,11 @@ Appendix A. License - + - + @@ -19,8 +19,8 @@  
-

-Appendix A. License

+

+Appendix A. License

Unless a COPYING file in a subdirectory or file-specific license headers
@@ -380,6 +380,6 @@ Public License instead of this License.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html index 9d3c0ef4..353bfa5b 100644 --- a/docs/api/html/ref-dbus.html +++ b/docs/api/html/ref-dbus.html @@ -3,12 +3,12 @@ D-Bus API Reference - + - + @@ -20,8 +20,8 @@ Next
-

-D-Bus API Reference

+

+D-Bus API Reference

This part documents the D-Bus interface used to access the NetworkManager daemon. @@ -30,6 +30,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19
\ No newline at end of file diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index c6805204..c9a2acda 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -3,12 +3,12 @@ Migrating from NetworkManager 0.8 to NetworkManager 0.9 - + - + @@ -20,23 +20,23 @@ Next
-

-Migrating from NetworkManager 0.8 to NetworkManager 0.9

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

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

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

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

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -74,7 +74,7 @@ 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
      • @@ -103,7 +103,7 @@

    -User Secret Agents

    +User Secret Agents

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

-Settings Service Interface Changes

+Settings Service Interface Changes

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

-Connection Object Interface Changes

+Connection Object Interface Changes

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

-Permissions Methods Consolidation

+Permissions Methods Consolidation

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

      -

      Table 23. 

      +

      Table 23. 

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

      -AddConnection Returns Object Path of New Connection

      +AddConnection Returns Object Path of New Connection

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

      -Support for WiMAX Devices

      +Support for WiMAX Devices

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

      -New Device States

      +New Device States

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

      -New Active Connection State

      +New Active Connection State

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

      -Consolidated Modem Devices

      +Consolidated Modem Devices

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

      -Secret Property Flags

      +Secret Property Flags

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

      -

      Table 24. 

      +

      Table 24. 

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

      -Deprecated Methods Removed

      +Deprecated Methods Removed

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

      -

      Table 25. 

      +

      Table 25. 

      @@ -536,6 +536,6 @@
      - Generated by GTK-Doc V1.18
      + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index a70f8150..28b89a23 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -3,12 +3,12 @@ Network Configuration Setting Specification - + - + @@ -20,10 +20,10 @@
      Next
      -

      -Network Configuration Setting Specification

      -
      -
      Configuration Settings
      +

      +Network Configuration Setting Specification

      +
      +
      Configuration Settings
      Secret flag types

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

      -Configuration Settings

      +Configuration Settings

      -

      Table 1. 802-1x setting

      +

      Table 1. 802-1x setting

      @@ -178,7 +178,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -235,6 +235,18 @@ + + + + + + + + + + + + @@ -246,7 +258,7 @@


      -

      Table 2. adsl setting

      +

      Table 2. adsl setting

      password
      		 
      string
      		 
      		Password used for EAP authentication methods.UTF-8 encoded password used for EAP authentication methods.
 
      
 
      
 
      password-flags
      password-raw
      		
 
      byte array
      		
 
      []
      		Password used for EAP authentication methods as a byte arrayPassword used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used.  If both 'password' and 'password-raw' are given, 'password' is preferred.
 
      
 
      
 
      password-raw-flags
      		Flags indicating how to handle the 802.1x phase2 private key password. (see the section called “Secret flag types” for flag values)
 
      
 
      pin
      string
      		PIN used for EAP authentication methods.
      pin-flags
      uint32
      0
      		Flags indicating how to handle the 802.1x PIN. (see the section called “Secret flag types” for flag values)
      
 
      system-ca-certs
      		
 
      boolean
      		
 
      FALSE
      		
 
      @@ -315,7 +327,7 @@
 

      
 
      
-
      Table 3. bluetooth setting
      
+
      Table 3. bluetooth setting
      
 
      
 
 

 
      @@ -354,7 +366,7 @@
 

      
 
      
-
      Table 4. bond setting
      
+
      Table 4. bond setting
      
 
      
 
 

 
      @@ -393,7 +405,7 @@
 

      
 
      
-
      Table 5. bridge setting
      
+
      Table 5. bridge setting
      
 
      
 
 

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

      
 
      
-
      Table 6. bridge-port setting
      
+
      Table 6. bridge-port setting
      
 
      
 
 

 
      @@ -507,7 +519,7 @@
 

      
 
      
-
      Table 7. cdma setting
      
+
      Table 7. cdma setting
      
 
      
 
 

 
      @@ -558,7 +570,7 @@
 

      
 
      
-
      Table 8. connection setting
      
+
      Table 8. connection setting
      
 
      
 
 

 
      @@ -651,7 +663,7 @@
 

      
 
      
-
      Table 9. gsm setting
      
+
      Table 9. gsm setting
      
 
      
 
 

 
      @@ -744,7 +756,7 @@
 

      
 
      
-
      Table 10. infiniband setting
      
+
      Table 10. infiniband setting
      
 
      
 
 

 
      @@ -789,7 +801,7 @@
 

      
 
      
-
      Table 11. ipv4 setting
      
+
      Table 11. ipv4 setting
      
 
      
 
 

 
      @@ -888,7 +900,7 @@
 

      
 
      
-
      Table 12. ipv6 setting
      
+
      Table 12. ipv6 setting
      
 
      
 
 

 
      @@ -913,7 +925,7 @@
 
-
+
@@ -981,7 +993,7 @@
 

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

      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.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 'ignore' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
 
      
 
      
 
      dhcp-hostname
      		
 
      @@ -1026,7 +1038,7 @@
 

      
 
      
-
      Table 14. ppp setting
      
+
      Table 14. ppp setting
      
 
      
 
 

 
      @@ -1161,7 +1173,7 @@
 

      
 
      
-
      Table 15. pppoe setting
      
+
      Table 15. pppoe setting
      
 
      
 
 

 
      @@ -1212,7 +1224,7 @@
 

      
 
      
-
      Table 16. serial setting
      
+
      Table 16. serial setting
      
 
      
 
 

 
      @@ -1269,7 +1281,7 @@
 

      
 
      
-
      Table 17. vlan setting
      
+
      Table 17. vlan setting
      
 
      
 
 

 
      @@ -1332,7 +1344,7 @@
 

      
 
      
-
      Table 18. vpn setting
      
+
      Table 18. vpn setting
      
 
      
 
 

 
      @@ -1383,7 +1395,7 @@
 

      
 
      
-
      Table 19. wimax setting
      
+
      Table 19. wimax setting
      
 
      
 
 

 
      @@ -1422,7 +1434,7 @@
 

      
 
      
-
      Table 20. 802-3-ethernet setting
      
+
      Table 20. 802-3-ethernet setting
      
 
      
 
 

 
      @@ -1515,7 +1527,7 @@
 

      
 
      
-
      Table 21. 802-11-wireless setting
      
+
      Table 21. 802-11-wireless setting
      
 
      
 
 

 
      @@ -1594,7 +1606,7 @@
 
-
+
@@ -1626,7 +1638,7 @@
 

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

      mac-address-blacklist
      		
 
      array of string
      		
 
      []
      		If specified, this connection will never apply to the WiFi device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
 
      
 
      
 
      mtu
      		
 
      @@ -1675,13 +1687,13 @@
 
-
+
-
+
@@ -1758,6 +1770,6 @@
 
      
 
      
-          Generated by GTK-Doc V1.18
      
+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
index 23f90ec7..4948a0a4 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -3,12 +3,12 @@
 Secret flag types
-
+
-
+
@@ -30,7 +30,7 @@
       
      
         
      
-
        
+
          
 
        • 
 0x0 (none) - the system is responsible for providing
             and storing this secret.
@@ -59,6 +59,6 @@
 
        
 
        
 
        
-          Generated by GTK-Doc V1.18
        
+          Generated by GTK-Doc V1.19
      
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 5e3559da..25c3f8a9 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,4 @@
-
-NetworkManager D-Bus Interface Specification version 0.9.8.0
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.0
      Copyright (C) 2008 - 2011 Red Hat, Inc.
      Copyright (C) 2008 - 2009 Novell, Inc.
      
+        
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.8
      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
@@ -273,6 +272,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      domains -
       s
      
           For available domains see SetLogging() call.
+        
      CheckConnectivity (
+        
+        ) →
+        u
      
+	Re-check the network connectivity state.
+      
      Returns
      connectivity -
+      u
+      (NM_CONNECTIVITY)
+    
      
+          The current connectivity state.
         
      state (
         
         ) →
@@ -352,6 +361,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.ao -
       (read)
      
         List of active connection object paths.
+      
      PrimaryConnection -
+      o -
+      (read)
      
+        The object path of the "primary" active connection being used
+        to access the network. In particular, if there is no VPN
+        active, or the VPN does not have the default route, then this
+        indicates the connection that has the default route. If there
+        is a VPN active with the default route, then this indicates
+        the connection that contains the route to the VPN endpoint.
+      
      ActivatingConnection -
+      o -
+      (read)
      
+        The object path of an active connection that is currently
+        being activated and which is expected to become the new
+        PrimaryConnection when it finishes activating.
       
      Version -
       s -
       (read)
      
@@ -362,6 +386,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_STATE)
     
      
         The overall state of the NetworkManager daemon.
+      
      Connectivity -
+      u -
+      (read)
+      (NM_CONNECTIVITY)
+    
      
+        The network connectivity state.
       
      Enumerated types:
      NM_STATE
      
         Describes the overall state of the daemon.
       
      NM_STATE_UNKNOWN = 0
      
@@ -381,6 +411,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NM_STATE_CONNECTED_GLOBAL = 70
      
           A network device is connected, with global network connectivity.
+        
      NM_CONNECTIVITY
      
+        Describes the network-connectivity state.
+      
      NM_CONNECTIVITY_UNKNOWN = 0
      
+          Network connectivity is unknown.
+        
      NM_CONNECTIVITY_NONE = 1
      
+          The host is not connected to any network.
+        
      NM_CONNECTIVITY_PORTAL = 2
      
+          The host is behind a captive portal and cannot reach the
+          full Internet.
+        
      NM_CONNECTIVITY_LIMITED = 3
      
+          The host is connected to a network, but does not appear to
+	  be able to reach the full Internet.
+        
      NM_CONNECTIVITY_FULL = 4
      
+	  The host is connected to a network, and appears to be able
+	  to reach the full Internet
         
      
 
   
      org.freedesktop.NetworkManager.AccessPoint
      Interface has no methods.
      Signals:
      PropertiesChanged (
@@ -1162,7 +1207,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        List the connections stored by this Settings object.
+        List the saved network connections known to NetworkManager.
       
      Returns
      connections -
       ao
      
           List of connections.
@@ -1181,7 +1226,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        Add new connection.
+        Add new connection and save it to disk.  This operation does not start
+        the network connection unless (1) device is idle and able to connect to
+        the network described by the new connection, and (2) the connection
+        is allowed to be started automatically.
       
      Parameters
      connection -
       a{sa{sv}}
      
           Connection settings and properties.
@@ -1206,7 +1254,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NewConnection (
         o: connection
         )
      
-        Emitted when a new connection has been added.
+        Emitted when a new connection has been added after NetworkManager has
+        started up and initialized.  This signal is not emitted for connections
+        read while starting up, because NetworkManager's D-Bus service is only
+        available after all connections have been read, and to prevent spamming
+        listeners with too many signals at one time.  To retrieve the initial
+        connection list, call the ListConnections() method once, and then listen
+        for individual Settings.NewConnection and Settings.Connection.Deleted
+        signals for further updates.
       
      Parameters
      connection -
       o
      
           Object path of the new connection.
@@ -1303,7 +1358,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.o -
       (read)
      The path of the connection.
      SpecificObject -
       o -
-      (read)
      A specific object associated with the active connection.
      Uuid -
+      (read)
      
+        A specific object associated with the active connection.  This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+      
      Uuid -
       s -
       (read)
      
         The UUID of the connection, provided as a convenience so that clients
@@ -1373,7 +1432,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.
+                secrets from the agent's user.  If user interaction is allowed
+                and the user enters new secrets, the agent is expected to save
+                the new secrets to persistent storage (if the secret's flags
+                include AGENT_OWNED) as NetworkManager will not send these
+                secrets back to the same agent via a SaveSecrets() call.
             
      Parameters
      connection -
       a{sa{sv}}
       (String_String_Variant_Map_Map)
@@ -1395,7 +1458,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any matching request should be canceled.
+                connection.  Any GetSecrets request with the same
+                'connection_path' and 'setting_name' that are given in a
+                CancelGetSecrets request should be canceled.
             
      Parameters
      connection_path -
       o
      
-                    Object path of the connection for which, if secrets are being
-                    requested, the request should be canceled.
+                    Object path of the connection for which, if secrets for
+                    the given 'setting_name' are being requested, the request
+                    should be canceled.
                 
      setting_name -
       s
      
                     Setting name for which secrets for this connection were
@@ -1754,6 +1822,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • NM_802_11_MODE
     - u
    • NM_ACTIVE_CONNECTION_STATE
     - u
    • NM_BT_CAPABILITIES
+    - u
    • NM_CONNECTIVITY
     - u
    • NM_DEVICE_CAP
     - u
    • NM_DEVICE_MODEM_CAPABILITIES
     - u
    • NM_DEVICE_STATE
@@ -1773,4 +1842,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • String_Variant_Map
     - a{ s → v }
-  
      • 
+  
\ No newline at end of file
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
new file mode 100644
index 00000000..e793df1c
--- /dev/null
+++ b/docs/api/settings-spec.xml
@@ -0,0 +1,1604 @@
+
+]>
      
+  Configuration Settings
+  
+
      
 
 

      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'.A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list 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'.A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one  of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 
      
 
      
 
      leap-username
      		
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
      
+  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.
+      
+      
+        pac-file
+        string
+        
+        UTF-8 encoded file path containing PAC for EAP-FAST.
+      
+      
+        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.
+      
+      
+        subject-match
+        string
+        
+        Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.
+      
+      
+        altsubject-matches
+        array of string
+        []
+        List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+      
+      
+        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-subject-match
+        string
+        
+        Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed.
+      
+      
+        phase2-altsubject-matches
+        array of string
+        []
+        List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+      
+      
+        phase2-client-cert
+        byte array
+        []
+        Contains the 'phase 2' client 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 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
+        
+        UTF-8 encoded password used for EAP authentication methods.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x password. (see  for flag values)
+      
+      
+        password-raw
+        byte array
+        []
+        Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used.  If both 'password' and 'password-raw' are given, 'password' is preferred.
+      
+      
+        password-raw-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x password byte array. (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-auth' 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)
+      
+      
+        pin
+        string
+        
+        PIN used for EAP authentication methods.
+      
+      
+        pin-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x PIN. (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.
+      
+    
+  
+
      
+
+  adsl setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        adsl
+        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.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the pppoa service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the pppoa service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the ADSL password. (see  for flag values)
+      
+      
+        protocol
+        string
+        
+        ADSL connection protocol.
+      
+      
+        encapsulation
+        string
+        
+        Encapsulation of ADSL connection
+      
+      
+        vpi
+        uint32
+        0
+        VPI of ADSL connection
+      
+      
+        vci
+        uint32
+        0
+        VCI of ADSL connection
+      
+    
+  
+
      
+
+  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.
+      
+    
+  
+
      
+
+  bond setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bond
+        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.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bonding network interface
+      
+      
+        options
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+      
+    
+  
+
      
+
+  bridge setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge
+        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.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bridging network interface
+      
+      
+        stp
+        boolean
+        TRUE
+        Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+      
+      
+        priority
+        uint32
+        128
+        Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
+      
+      
+        forward-delay
+        uint32
+        15
+        The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+      
+      
+        hello-time
+        uint32
+        2
+        The Spanning Tree Protocol (STP) hello time, in seconds.
+      
+      
+        max-age
+        uint32
+        20
+        The Spanning Tree Protocol (STP) maximum message age, in seconds.
+      
+      
+        ageing-time
+        uint32
+        300
+        The ethernet MAC address aging time, in seconds.
+      
+    
+  
+
      
+
+  bridge-port setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge-port
+        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.
+      
+      
+        priority
+        uint32
+        32
+        The Spanning Tree Protocol (STP) priority of this bridge port
+      
+      
+        path-cost
+        uint32
+        100
+        The Spanning Tree Protocol (STP) port cost for destinations via this port.
+      
+      
+        hairpin-mode
+        boolean
+        FALSE
+        Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.
+      
+    
+  
+
      
+
+  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.
+      
+      
+        zone
+        string
+        
+        The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall.
+      
+      
+        master
+        string
+        
+        Interface name of the master device or UUID of the master connection
+      
+      
+        slave-type
+        string
+        
+        Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
+      
+      
+        secondaries
+        array of string
+        []
+        List of connection UUIDs that should be activated when the base connection itself is activated.
+      
+    
+  
+
      
+
+  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.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
+      
+      
+        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, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. 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.
+      
+    
+  
+
      
+
+  infiniband setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        infiniband
+        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.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+      
+      
+        transport-mode
+        string
+        
+        The IPoIB transport mode. Either 'datagram' or 'connected'.
+      
+    
+  
+
      
+
+  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 upstream 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 customize 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
+        TRUE
+        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 'ignore' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
+      
+      
+        dhcp-hostname
+        string
+        
+        The specified name will be sent to the DHCP server when acquiring a lease.
+      
+      
+        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
+        TRUE
+        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.
+      
+      
+        ip6-privacy
+        int32
+        -1
+        Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).
+      
+    
+  
+
      
+
+  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.
+      
+    
+  
+
      
+
+  vlan setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        vlan
+        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.
+      
+      
+        interface-name
+        string
+        
+        If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.
+      
+      
+        parent
+        string
+        
+        If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.
+      
+      
+        id
+        uint32
+        0
+        The VLAN indentifier the interface created by this connection should be assigned.
+      
+      
+        flags
+        uint32
+        0
+        One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).
+      
+      
+        ingress-priority-map
+        array of string
+        []
+        For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+      
+        egress-priority-map
+        array of string
+        []
+        For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+    
+  
+
      
+
+  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
+        
+        If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
+      
+      
+        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.
+      
+      
+        mac-address-blacklist
+        array of string
+        []
+        If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
+      
+      
+        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
+        array of string
+        []
+        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', 'adhoc' or 'ap'.  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.
+      
+      
+        mac-address-blacklist
+        array of string
+        []
+        A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
+      
+      
+        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. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.
+      
+      
+        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.
+      
+      
+        hidden
+        boolean
+        FALSE
+        If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
+      
+    
+  
+
      
+
+  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
+        []
+        A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of 'wep40', 'wep104', 'tkip' or 'ccmp'.
+      
+      
+        group
+        array of string
+        []
+        A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list 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
index 5e3559da..25c3f8a9 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,4 @@
-
-NetworkManager D-Bus Interface Specification version 0.9.8.0
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.0
      Copyright (C) 2008 - 2011 Red Hat, Inc.
      Copyright (C) 2008 - 2009 Novell, Inc.
      
+        
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.8
      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
@@ -273,6 +272,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      domains -
       s
      
           For available domains see SetLogging() call.
+        
      CheckConnectivity (
+        
+        ) →
+        u
      
+	Re-check the network connectivity state.
+      
      Returns
      connectivity -
+      u
+      (NM_CONNECTIVITY)
+    
      
+          The current connectivity state.
         
      state (
         
         ) →
@@ -352,6 +361,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.ao -
       (read)
      
         List of active connection object paths.
+      
      PrimaryConnection -
+      o -
+      (read)
      
+        The object path of the "primary" active connection being used
+        to access the network. In particular, if there is no VPN
+        active, or the VPN does not have the default route, then this
+        indicates the connection that has the default route. If there
+        is a VPN active with the default route, then this indicates
+        the connection that contains the route to the VPN endpoint.
+      
      ActivatingConnection -
+      o -
+      (read)
      
+        The object path of an active connection that is currently
+        being activated and which is expected to become the new
+        PrimaryConnection when it finishes activating.
       
      Version -
       s -
       (read)
      
@@ -362,6 +386,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_STATE)
     
      
         The overall state of the NetworkManager daemon.
+      
      Connectivity -
+      u -
+      (read)
+      (NM_CONNECTIVITY)
+    
      
+        The network connectivity state.
       
      Enumerated types:
      NM_STATE
      
         Describes the overall state of the daemon.
       
      NM_STATE_UNKNOWN = 0
      
@@ -381,6 +411,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NM_STATE_CONNECTED_GLOBAL = 70
      
           A network device is connected, with global network connectivity.
+        
      NM_CONNECTIVITY
      
+        Describes the network-connectivity state.
+      
      NM_CONNECTIVITY_UNKNOWN = 0
      
+          Network connectivity is unknown.
+        
      NM_CONNECTIVITY_NONE = 1
      
+          The host is not connected to any network.
+        
      NM_CONNECTIVITY_PORTAL = 2
      
+          The host is behind a captive portal and cannot reach the
+          full Internet.
+        
      NM_CONNECTIVITY_LIMITED = 3
      
+          The host is connected to a network, but does not appear to
+	  be able to reach the full Internet.
+        
      NM_CONNECTIVITY_FULL = 4
      
+	  The host is connected to a network, and appears to be able
+	  to reach the full Internet
         
      
 
   
      org.freedesktop.NetworkManager.AccessPoint
      Interface has no methods.
      Signals:
      PropertiesChanged (
@@ -1162,7 +1207,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        List the connections stored by this Settings object.
+        List the saved network connections known to NetworkManager.
       
      Returns
      connections -
       ao
      
           List of connections.
@@ -1181,7 +1226,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        Add new connection.
+        Add new connection and save it to disk.  This operation does not start
+        the network connection unless (1) device is idle and able to connect to
+        the network described by the new connection, and (2) the connection
+        is allowed to be started automatically.
       
      Parameters
      connection -
       a{sa{sv}}
      
           Connection settings and properties.
@@ -1206,7 +1254,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NewConnection (
         o: connection
         )
      
-        Emitted when a new connection has been added.
+        Emitted when a new connection has been added after NetworkManager has
+        started up and initialized.  This signal is not emitted for connections
+        read while starting up, because NetworkManager's D-Bus service is only
+        available after all connections have been read, and to prevent spamming
+        listeners with too many signals at one time.  To retrieve the initial
+        connection list, call the ListConnections() method once, and then listen
+        for individual Settings.NewConnection and Settings.Connection.Deleted
+        signals for further updates.
       
      Parameters
      connection -
       o
      
           Object path of the new connection.
@@ -1303,7 +1358,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.o -
       (read)
      The path of the connection.
      SpecificObject -
       o -
-      (read)
      A specific object associated with the active connection.
      Uuid -
+      (read)
      
+        A specific object associated with the active connection.  This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+      
      Uuid -
       s -
       (read)
      
         The UUID of the connection, provided as a convenience so that clients
@@ -1373,7 +1432,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.
+                secrets from the agent's user.  If user interaction is allowed
+                and the user enters new secrets, the agent is expected to save
+                the new secrets to persistent storage (if the secret's flags
+                include AGENT_OWNED) as NetworkManager will not send these
+                secrets back to the same agent via a SaveSecrets() call.
             
      Parameters
      connection -
       a{sa{sv}}
       (String_String_Variant_Map_Map)
@@ -1395,7 +1458,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any matching request should be canceled.
+                connection.  Any GetSecrets request with the same
+                'connection_path' and 'setting_name' that are given in a
+                CancelGetSecrets request should be canceled.
             
      Parameters
      connection_path -
       o
      
-                    Object path of the connection for which, if secrets are being
-                    requested, the request should be canceled.
+                    Object path of the connection for which, if secrets for
+                    the given 'setting_name' are being requested, the request
+                    should be canceled.
                 
      setting_name -
       s
      
                     Setting name for which secrets for this connection were
@@ -1754,6 +1822,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • NM_802_11_MODE
     - u
    • NM_ACTIVE_CONNECTION_STATE
     - u
    • NM_BT_CAPABILITIES
+    - u
    • NM_CONNECTIVITY
     - u
    • NM_DEVICE_CAP
     - u
    • NM_DEVICE_MODEM_CAPABILITIES
     - u
    • NM_DEVICE_STATE
@@ -1773,4 +1842,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • String_Variant_Map
     - a{ s → v }
-  
    
+  

\ No newline at end of file
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 68f4aad3..fe98bd59 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-0.9.8.0
+0.9.8.8
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index af78a7d1..ab677caa 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 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.
@@ -21,23 +20,51 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
 subdir = docs/libnm-glib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -78,12 +105,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -91,6 +124,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -233,7 +267,6 @@ 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@
@@ -248,6 +281,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -459,6 +494,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### templates ####
+GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -501,11 +572,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -646,18 +717,18 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distclean-local 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 \
+	clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+	distclean distclean-generic distclean-libtool distclean-local \
+	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-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -667,35 +738,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    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 -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
 	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
-
-#### scan ####
+	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	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 \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -710,22 +774,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	$(AM_V_at)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
+	$(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
@@ -733,28 +794,20 @@ tmpl.stamp: tmpl-build.stamp
 $(srcdir)/tmpl/*.sgml:
 	@true
 
-#### xml ####
-
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	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
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -775,16 +828,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -801,7 +850,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -817,7 +866,7 @@ distclean-local:
 	    rm -rf tmpl; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -853,7 +902,7 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index a205b980..dfa604c6 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -3,12 +3,12 @@
 
 
 NMAccessPoint
-
+
 
 
 
 
-
+
 
 
 
@@ -43,34 +43,34 @@
 

 

 
Synopsis

-
                    NMAccessPoint;
-                    NMAccessPointClass;
+
#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_FLAGS
 #define             NM_ACCESS_POINT_FREQUENCY
-#define             NM_ACCESS_POINT_HW_ADDRESS
-#define             NM_ACCESS_POINT_MAX_BITRATE
 #define             NM_ACCESS_POINT_MODE
-#define             NM_ACCESS_POINT_RSN_FLAGS
-#define             NM_ACCESS_POINT_SSID
+#define             NM_ACCESS_POINT_MAX_BITRATE
 #define             NM_ACCESS_POINT_STRENGTH
-#define             NM_ACCESS_POINT_WPA_FLAGS
-gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
-                                                         NMConnection *connection);
-GSList *            nm_access_point_filter_connections  (NMAccessPoint *ap,
-                                                         const GSList *connections);
-const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);
+#define             NM_ACCESS_POINT_HW_ADDRESS
+                    NMAccessPoint;
+                    NMAccessPointClass;
+GObject *           nm_access_point_new                 (DBusGConnection *connection,
+                                                         const char *path);
 NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
-guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);
-const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);
-guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);
-NM80211Mode         nm_access_point_get_mode            (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);
+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);
-NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
-GObject *           nm_access_point_new                 (DBusGConnection *connection,
-                                                         const char *path);
+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);
 

 

 

@@ -110,192 +110,177 @@ NMAccessPoint implements
 

 
Details

 

-
NMAccessPoint

-
typedef struct _NMAccessPoint NMAccessPoint;

+
NM_ACCESS_POINT_FLAGS

+
#define NM_ACCESS_POINT_FLAGS       "flags"
+

 

 

 

 

 

-
NMAccessPointClass

-
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);
-} NMAccessPointClass;
+
NM_ACCESS_POINT_WPA_FLAGS

+
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 

 

 

 

 

 

-
NM_ACCESS_POINT_BSSID

-
#define NM_ACCESS_POINT_BSSID       "bssid"
+
NM_ACCESS_POINT_RSN_FLAGS

+
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 

 

 

 

 

 

-
NM_ACCESS_POINT_FLAGS

-
#define NM_ACCESS_POINT_FLAGS       "flags"
+
NM_ACCESS_POINT_SSID

+
#define NM_ACCESS_POINT_SSID        "ssid"
 

 

 

 

 

 

-
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_MAX_BITRATE

-
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
+
NM_ACCESS_POINT_MODE

+
#define NM_ACCESS_POINT_MODE        "mode"
 

 

 

 

 

 

-
NM_ACCESS_POINT_MODE

-
#define NM_ACCESS_POINT_MODE        "mode"
+
NM_ACCESS_POINT_MAX_BITRATE

+
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

 

 

 

 

 

-
NM_ACCESS_POINT_RSN_FLAGS

-
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
+
NM_ACCESS_POINT_STRENGTH

+
#define NM_ACCESS_POINT_STRENGTH    "strength"
 

 

 

 

 

 

-
NM_ACCESS_POINT_SSID

-
#define NM_ACCESS_POINT_SSID        "ssid"
+
NM_ACCESS_POINT_HW_ADDRESS

+
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 

 

 

 

 

 

-
NM_ACCESS_POINT_STRENGTH

-
#define NM_ACCESS_POINT_STRENGTH    "strength"
-

+
NMAccessPoint

+
typedef struct _NMAccessPoint NMAccessPoint;

 

 

 

 

 

-
NM_ACCESS_POINT_WPA_FLAGS

-
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
+
NMAccessPointClass

+
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);
+} NMAccessPointClass;
 

 

 

 

 

 

-
nm_access_point_connection_valid ()

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

+
nm_access_point_new ()

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

 

-Validates a given connection against a given WiFi access point to ensure that
-the connection may be activated with that AP.  The connection must match the
-ap's SSID, (if given) BSSID, and other attributes like security settings,
-channel, band, etc.
+Creates a new NMAccessPoint.
 

-

+

+++
-
-
-
-
-
+
+
+
+
-
+

 


 
 
ap :
an NMAccessPoint to validate connection against

 
connection :
an NMConnection to validate against ap
+the DBusGConnection
 
 

 
path :
the DBusobject path of the access point

 
Returns :

-TRUE if the connection may be activated with this WiFi AP,
-FALSE if it cannot be.a new access point. [transfer full]
+
 

 
 

 

 

 

-
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.
-

+
nm_access_point_get_flags ()

+
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

 

-To obtain the list of connections that are compatible with this access point,
-use nm_remote_settings_list_connections() and then filter the returned list
-for a given NMDevice using nm_device_filter_connections() and finally
-filter that list with this function.
+Gets the flags of the access point.
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
ap :
an NMAccessPoint to filter connections for
connections :
a list of
-NMConnection objects to filter. [element-type NetworkManager.Connection]
+a NMAccessPoint
 
 

 

 
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]
-the flags
 

 
 

 

 

 

-
nm_access_point_get_bssid ()

-
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);

+
nm_access_point_get_wpa_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

 

-Gets the Basic Service Set ID (BSSID) of the WiFi access point.
+Gets the WPA (version 1) flags of the access point.
 

-

+

+++
@@ -304,21 +289,24 @@ Gets the Basic Service Set ID (BSSID) of the WiFi access point.
 
-
+

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_flags ()

-
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

+
nm_access_point_get_rsn_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

 

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

-

+

+++
@@ -327,20 +315,23 @@ Gets the flags of the access point.
 
-
+

 


 
 

 
ap :

 

 
Returns :
the flagsthe RSN flags
 

 
 

 

 

 

-
nm_access_point_get_frequency ()

-
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

+
nm_access_point_get_ssid ()

+
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

 

-Gets the frequency of the access point.
+Gets the SSID of the access point.
 

-

+

+++
@@ -349,24 +340,24 @@ Gets the frequency of the access point.
 
-
+

 


 
 

 
ap :

 

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

 
 

 

 

 

-
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.

-

+
nm_access_point_get_bssid ()

+
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);

 

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

-

+

+++
@@ -375,21 +366,24 @@ Gets the hardware (MAC) address of the access point.
 
-
+

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_max_bitrate ()

-
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

+
nm_access_point_get_frequency ()

+
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

 

-Gets the maximum bit rate of the access point.
+Gets the frequency of the access point.
 

-

+

+++
@@ -398,7 +392,7 @@ Gets the maximum bit rate of the access point.
 
-
+

 


 
 

 
ap :

 

 
Returns :
the maximum bit ratethe frequency
 

 
 

@@ -410,8 +404,11 @@ Gets the maximum bit rate of the access point.
 

 Gets the mode of the access point.
 

-

+

+++
@@ -427,14 +424,16 @@ Gets the mode of the access point.
 

-
nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

+
nm_access_point_get_max_bitrate ()

+
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

 

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

-

 


 
 

 
ap :

 
 

+

+++
@@ -443,20 +442,23 @@ point.
 
-
+

 


 
 

 
ap :

 

 
Returns :
the RSN flagsthe maximum bit rate
 

 
 

 

 

 

-
nm_access_point_get_ssid ()

-
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

+
nm_access_point_get_strength ()

+
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);

 

-Gets the SSID of the access point.
+Gets the current signal strength of the access point.
 

-

+

+++
@@ -465,80 +467,117 @@ Gets the SSID of the access point.
 
-
+

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_strength ()

-
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);

+
nm_access_point_filter_connections ()

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

 

-Gets the current signal strength of the access point.
+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.
 

-

+

+To obtain the list of connections that are compatible with this access point,
+use nm_remote_settings_list_connections() and then filter the returned list
+for a given NMDevice using nm_device_filter_connections() and finally
+filter that list with this function.
+

+

+++
-
+
+
+
+
-
+

 


 
 

 
ap :
a NMAccessPoint
+an NMAccessPoint to filter connections for
connections :
a list of
+NMConnection objects to filter. [element-type NetworkManager.Connection]
 
 

 

 
Returns :
the signal strengtha
+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_get_wpa_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

+
nm_access_point_connection_valid ()

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

 

-Gets the WPA (version 1) flags of the access point.
+Validates a given connection against a given WiFi access point to ensure that
+the connection may be activated with that AP.  The connection must match the
+ap's SSID, (if given) BSSID, and other attributes like security settings,
+channel, band, etc.
 

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
ap :
a NMAccessPoint
+an NMAccessPoint to validate connection against
connection :
an NMConnection to validate against ap
 
 

 

 
Returns :
the WPA flags
+TRUE if the connection may be activated with this WiFi AP,
+FALSE if it cannot be.
 

 
 

 

 

 

-
nm_access_point_new ()

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

+
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.

+

 

-Creates a new NMAccessPoint.
+Gets the hardware (MAC) address of the access point.
 

-

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
ap :
a NMAccessPoint
 
 

 
path :
the DBusobject path of the access point

 
Returns :
a new access point. [transfer full]
-the hardware address of the access point. This is the internal string used by the
+access point and must not be modified.
 

 
 

@@ -643,6 +682,6 @@ The WPA flags of the access point.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 17ebafd4..9cb406f4 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -3,12 +3,12 @@
 
 
 NMActiveConnection
-
+
 
 
 
 
-
+
 
 
 
@@ -43,27 +43,27 @@
 

 

 
Synopsis

-
                    NMActiveConnection;
-                    NMActiveConnectionClass;
-#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
 #define             NM_ACTIVE_CONNECTION_DEFAULT
 #define             NM_ACTIVE_CONNECTION_DEFAULT6
-#define             NM_ACTIVE_CONNECTION_DEVICES
 #define             NM_ACTIVE_CONNECTION_MASTER
-#define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-#define             NM_ACTIVE_CONNECTION_STATE
-#define             NM_ACTIVE_CONNECTION_UUID
+                    NMActiveConnection;
+                    NMActiveConnectionClass;
+GObject *           nm_active_connection_new            (DBusGConnection *connection,
+                                                         const char *path);
 const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
-gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
-gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
-const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
-const char *        nm_active_connection_get_master     (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);
 NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
-const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
-GObject *           nm_active_connection_new            (DBusGConnection *connection,
-                                                         const char *path);
+gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
+gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
+const char *        nm_active_connection_get_master     (NMActiveConnection *connection);
 

 

 

@@ -102,126 +102,136 @@ NMActiveConnection implements
 

 
Details

 

-
NMActiveConnection

-
typedef struct _NMActiveConnection NMActiveConnection;

+
NM_ACTIVE_CONNECTION_CONNECTION

+
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+

 

 

 

 

 

-
NMActiveConnectionClass

-
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);
-} NMActiveConnectionClass;
+
NM_ACTIVE_CONNECTION_UUID

+
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_CONNECTION

-
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

+
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEFAULT

-
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
+
NM_ACTIVE_CONNECTION_DEVICES

+
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEFAULT6

-
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
+
NM_ACTIVE_CONNECTION_STATE

+
#define NM_ACTIVE_CONNECTION_STATE               "state"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEVICES

-
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
+
NM_ACTIVE_CONNECTION_DEFAULT

+
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_MASTER

-
#define NM_ACTIVE_CONNECTION_MASTER              "master"
+
NM_ACTIVE_CONNECTION_DEFAULT6

+
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

-
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
+
NM_ACTIVE_CONNECTION_MASTER

+
#define NM_ACTIVE_CONNECTION_MASTER              "master"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_STATE

-
#define NM_ACTIVE_CONNECTION_STATE               "state"
-

+
NMActiveConnection

+
typedef struct _NMActiveConnection NMActiveConnection;

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_UUID

-
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
+
NMActiveConnectionClass

+
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);
+} NMActiveConnectionClass;
 

 

 

 

 

 

-
nm_active_connection_get_connection ()

-
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

+
nm_active_connection_new ()

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

 

-Gets the NMConnection's DBus object path.
+Creates a new NMActiveConnection.
 

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
connection :
a NMActiveConnection
+the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :
the object path of the NMConnection inside of NMActiveConnection.
-This is the internal string used by the connection, and must not be modified.a new active connection. [transfer full]
+
 

 
 

 

 

 

-
nm_active_connection_get_default ()

-
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

+
nm_active_connection_get_connection ()

+
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

 

-Whether the active connection is the default IPv4 one (that is, is used for
-the default IPv4 route and DNS information).
+Gets the NMConnection's DBus object path.
 

-

+

+++
@@ -230,22 +240,24 @@ the default IPv4 route and DNS information).
 
-
+

 


 
 

 
connection :

 

 
Returns :

-TRUE if the active connection is the default IPv4 connectionthe 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_default6 ()

-
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

+
nm_active_connection_get_uuid ()

+
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

 

-Whether the active connection is the default IPv6 one (that is, is used for
-the default IPv6 route and DNS information).
+Gets the NMConnection's UUID.
 

-

+

+++
@@ -254,21 +266,25 @@ the default IPv6 route and DNS information).
 
-
+

 


 
 

 
connection :

 

 
Returns :

-TRUE if the active connection is the default IPv6 connectionthe 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_devices ()

-
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

+
nm_active_connection_get_specific_object ()

+
const char *        nm_active_connection_get_specific_object
+                                                        (NMActiveConnection *connection);

 

-Gets the NMDevices used for the active connections.
+Gets the "specific object" used at the activation.
 

-

+

+++
@@ -277,22 +293,24 @@ Gets the Returns :

-
+

 


 
 

 
connection :
the GPtrArray containing NMDevices.
-This is the internal copy used by the connection, and must not be modified. [element-type NMClient.Device]
-the specific object's DBus path. This is the internal string used by the
+connection, and must not be modified.
 

 
 

 

 

 

-
nm_active_connection_get_master ()

-
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);

+
nm_active_connection_get_devices ()

+
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

 

-Gets the path to the master NMDevice of the connection.
+Gets the NMDevices used for the active connections.
 

-

+

+++
@@ -301,22 +319,25 @@ Gets the path to the master Returns :

-
+

 


 
 

 
connection :
the path of the master NMDevice of the NMActiveConnection.
-This is the internal string 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_specific_object ()

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

+
nm_active_connection_get_state ()

+
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

 

-Gets the "specific object" used at the activation.
+Gets the active connection's state.
 

-

+

+++
@@ -325,21 +346,24 @@ Gets the "specific object" used at the activation.
 
-
+

 


 
 

 
connection :

 

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

 
 

 

 

 

-
nm_active_connection_get_state ()

-
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

+
nm_active_connection_get_default ()

+
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

 

-Gets the active connection's state.
+Whether the active connection is the default IPv4 one (that is, is used for
+the default IPv4 route and DNS information).
 

-

+

+++
@@ -348,20 +372,25 @@ Gets the active connection's state.
 
-
+

 


 
 

 
connection :

 

 
Returns :
the state
+TRUE if the active connection is the default IPv4 connection
 

 
 

 

 

 

-
nm_active_connection_get_uuid ()

-
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

+
nm_active_connection_get_default6 ()

+
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

 

-Gets the NMConnection's UUID.
+Whether the active connection is the default IPv6 one (that is, is used for
+the default IPv6 route and DNS information).
 

-

+

+++
@@ -370,36 +399,34 @@ Gets the Returns :

-
+

 


 
 

 
connection :
the UUID of the NMConnection that backs the NMActiveConnection.
-This is the internal string used by the connection, and must not be modified.
+TRUE if the active connection is the default IPv6 connection
 

 
 

 

 

 

-
nm_active_connection_new ()

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

+
nm_active_connection_get_master ()

+
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);

 

-Creates a new NMActiveConnection.
+Gets the path to the master NMDevice of the connection.
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
connection :
the DBusGConnection
+a NMActiveConnection
 
 

 
path :
the DBus object path of the device

 
Returns :
a new active connection. [transfer full]
-the path of the master NMDevice of the NMActiveConnection.
+This is the internal string used by the connection, and must not be modified.
 

 
 

@@ -480,6 +507,6 @@ The active connection's UUID
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 83d7fdef..18eddaf5 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -3,12 +3,12 @@
 
 
 NMClient
-
+
 
 
 
 
-
+
 
 
 
@@ -45,36 +45,50 @@
 

 

 
Synopsis

-
                    NMClient;
-void                (*NMClientActivateFn)               (NMClient *client,
-                                                         NMActiveConnection *active_connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMClientAddActivateFn)            (NMClient *client,
-                                                         NMActiveConnection *connection,
-                                                         const char *new_connection_path,
-                                                         GError *error,
-                                                         gpointer user_data);
-                    NMClientClass;
-enum                NMClientPermission;
-enum                NMClientPermissionResult;
-#define             NM_CLIENT_ACTIVE_CONNECTIONS
+
#define             NM_CLIENT_VERSION
+#define             NM_CLIENT_STATE
 #define             NM_CLIENT_MANAGER_RUNNING
 #define             NM_CLIENT_NETWORKING_ENABLED
-#define             NM_CLIENT_STATE
-#define             NM_CLIENT_VERSION
-#define             NM_CLIENT_WIMAX_ENABLED
-#define             NM_CLIENT_WIMAX_HARDWARE_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
+#define             NM_CLIENT_CONNECTIVITY
+#define             NM_CLIENT_PRIMARY_CONNECTION
+#define             NM_CLIENT_ACTIVATING_CONNECTION
+enum                NMClientPermission;
+enum                NMClientPermissionResult;
+                    NMClient;
+                    NMClientClass;
+NMClient *          nm_client_new                       (void);
+void                nm_client_new_async                 (GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+NMClient *          nm_client_new_finish                (GAsyncResult *result,
+                                                         GError **error);
+const GPtrArray *   nm_client_get_devices               (NMClient *client);
+NMDevice *          nm_client_get_device_by_path        (NMClient *client,
+                                                         const char *object_path);
+NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
+                                                         const char *iface);
+void                (*NMClientActivateFn)               (NMClient *client,
+                                                         NMActiveConnection *active_connection,
+                                                         GError *error,
+                                                         gpointer user_data);
 void                nm_client_activate_connection       (NMClient *client,
                                                          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,
@@ -84,51 +98,54 @@ enum                gpointer user_data);
 void                nm_client_deactivate_connection     (NMClient *client,
                                                          NMActiveConnection *active);
-const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
-NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
-                                                         const char *iface);
-NMDevice *          nm_client_get_device_by_path        (NMClient *client,
-                                                         const char *object_path);
-const GPtrArray *   nm_client_get_devices               (NMClient *client);
-gboolean            nm_client_get_logging               (NMClient *client,
-                                                         char **level,
-                                                         char **domains,
-                                                         GError **error);
+gboolean            nm_client_networking_get_enabled    (NMClient *client);
+void                nm_client_networking_set_enabled    (NMClient *client,
+                                                         gboolean enabled);
+gboolean            nm_client_wireless_get_enabled      (NMClient *client);
+void                nm_client_wireless_set_enabled      (NMClient *client,
+                                                         gboolean enabled);
+gboolean            nm_client_wireless_hardware_get_enabled
+                                                        (NMClient *client);
+gboolean            nm_client_wwan_get_enabled          (NMClient *client);
+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);
+void                nm_client_sleep                     (NMClient *client,
+                                                         gboolean sleep_);
 NMClientPermissionResult nm_client_get_permission_result
                                                         (NMClient *client,
                                                          NMClientPermission permission);
-NMState             nm_client_get_state                 (NMClient *client);
-const char *        nm_client_get_version               (NMClient *client);
-gboolean            nm_client_networking_get_enabled    (NMClient *client);
-void                nm_client_networking_set_enabled    (NMClient *client,
-                                                         gboolean enabled);
-NMClient *          nm_client_new                       (void);
-void                nm_client_new_async                 (GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-NMClient *          nm_client_new_finish                (GAsyncResult *result,
+gboolean            nm_client_get_logging               (NMClient *client,
+                                                         char **level,
+                                                         char **domains,
                                                          GError **error);
 gboolean            nm_client_set_logging               (NMClient *client,
                                                          const char *level,
                                                          const char *domains,
                                                          GError **error);
-void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep_);
-gboolean            nm_client_wimax_get_enabled         (NMClient *client);
-gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);
-void                nm_client_wimax_set_enabled         (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wireless_get_enabled      (NMClient *client);
-gboolean            nm_client_wireless_hardware_get_enabled
+NMConnectivityState nm_client_get_connectivity          (NMClient *client);
+NMConnectivityState nm_client_check_connectivity        (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GError **error);
+void                nm_client_check_connectivity_async  (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+NMConnectivityState nm_client_check_connectivity_finish (NMClient *client,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+NMActiveConnection * nm_client_get_primary_connection   (NMClient *client);
+NMActiveConnection * nm_client_get_activating_connection
                                                         (NMClient *client);
-void                nm_client_wireless_set_enabled      (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wwan_get_enabled          (NMClient *client);
-gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
-void                nm_client_wwan_set_enabled          (NMClient *client,
-                                                         gboolean enabled);
 

 

 

@@ -148,9 +165,12 @@ NMClient implements
 

 
Properties

 
+  "activating-connection"    NMActiveConnection*   : Read
   "active-connections"       NMObjectArray*        : Read
+  "connectivity"             guint                 : Read
   "manager-running"          gboolean              : Read
   "networking-enabled"       gboolean              : Read / Write
+  "primary-connection"       NMActiveConnection*   : Read
   "state"                    guint                 : Read
   "version"                  gchar*                : Read
   "wimax-enabled"            gboolean              : Read / Write
@@ -177,53 +197,112 @@ NMClient implements
 

 
Details

 

-
NMClient

-
typedef struct _NMClient NMClient;

+
NM_CLIENT_VERSION

+
#define NM_CLIENT_VERSION "version"
+

 

 

 

 

 

-
NMClientActivateFn ()

-
void                (*NMClientActivateFn)               (NMClient *client,
-                                                         NMActiveConnection *active_connection,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NM_CLIENT_STATE

+
#define NM_CLIENT_STATE "state"
+

 

 

 

 

 

-
NMClientAddActivateFn ()

-
void                (*NMClientAddActivateFn)            (NMClient *client,
-                                                         NMActiveConnection *connection,
-                                                         const char *new_connection_path,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NM_CLIENT_MANAGER_RUNNING

+
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+

 

 

 

 

 

-
NMClientClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Signals */
-	void (*device_added) (NMClient *client, NMDevice *device);
-	void (*device_removed) (NMClient *client, NMDevice *device);
-	void (*permission_changed) (NMClient *client,
-	                            NMClientPermission permission,
-	                            NMClientPermissionResult result);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMClientClass;
+
NM_CLIENT_NETWORKING_ENABLED

+
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIRELESS_ENABLED

+
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

+
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WWAN_ENABLED

+
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WWAN_HARDWARE_ENABLED

+
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
+

+

+

+

+

+

+
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"
+

+

+

+

+

+

+
NM_CLIENT_CONNECTIVITY

+
#define NM_CLIENT_CONNECTIVITY "connectivity"
+

+

+

+

+

+

+
NM_CLIENT_PRIMARY_CONNECTION

+
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
+

+

+

+

+

+

+
NM_CLIENT_ACTIVATING_CONNECTION

+
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 

 

 

@@ -252,8 +331,11 @@ NMClient implements
 NMClientPermission values indicate various permissions that NetworkManager
 clients can obtain to perform certain tasks on behalf of the current user.
 

-

+

+++
@@ -348,8 +430,11 @@ clients can obtain to perform certain tasks on behalf of the current user.
 NMClientPermissionResult values indicate what authorizations and permissions
 the user requires to obtain a given NMClientPermission

-

 


 
 

 
NM_CLIENT_PERMISSION_NONE

 

+

+++
@@ -378,89 +463,235 @@ the user requires to obtain a given 
-
NM_CLIENT_ACTIVE_CONNECTIONS

-
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
-

+
NMClient

+
typedef struct _NMClient NMClient;

 

-
NM_CLIENT_MANAGER_RUNNING

-
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+
NMClientClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Signals */
+	void (*device_added) (NMClient *client, NMDevice *device);
+	void (*device_removed) (NMClient *client, NMDevice *device);
+	void (*permission_changed) (NMClient *client,
+	                            NMClientPermission permission,
+	                            NMClientPermissionResult result);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMClientClass;
 

 

 

 

-
NM_CLIENT_NETWORKING_ENABLED

-
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
-

+
nm_client_new ()

+
NMClient *          nm_client_new                       (void);

 

+Creates a new NMClient.
 

-

-

-

-
NM_CLIENT_STATE

-
#define NM_CLIENT_STATE "state"
-

 

+Note that this will do blocking D-Bus calls to initialize the
+client. You can use nm_client_new_async() if you want to avoid
+that.
 

-

-

-

-
NM_CLIENT_VERSION

-
#define NM_CLIENT_VERSION "version"
-

 

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
 

+

 


 
 

 
NM_CLIENT_PERMISSION_RESULT_UNKNOWN

 
 
 
 
 
 

++++
+
+
+
+
+




Returns :
a new NMClient
+

 

 

 

-
NM_CLIENT_WIMAX_ENABLED

-
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
-

+
nm_client_new_async ()

+
void                nm_client_new_async                 (GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

+Creates a new NMClient and begins asynchronously initializing it.
+callback will be called when it is done; use
+nm_client_new_finish() to get the result.
+

+

+NOTE: NMClient provides information about devices and a mechanism to
+control them.  To access and modify network configuration data, use the
+NMRemoteSettings object.
 

+

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




cancellable :
a GCancellable, or NULL
+
callback :
callback to call when the client is created
user_data :
data for callback
+

 

 

 

-
NM_CLIENT_WIMAX_HARDWARE_ENABLED

-
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
-

+
nm_client_new_finish ()

+
NMClient *          nm_client_new_finish                (GAsyncResult *result,
+                                                         GError **error);

 

+Gets the result of an nm_client_new_async() call.
 

+

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




result :
a GAsyncResult
+
error :
location for a GError, or NULL
+
Returns :
a new NMClient, or NULL on error

 

 

 

-
NM_CLIENT_WIRELESS_ENABLED

-
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
-

+
nm_client_get_devices ()

+
const GPtrArray *   nm_client_get_devices               (NMClient *client);

 

+Gets all the known network devices.  Use nm_device_get_type() or the
+NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the
+returned array is, and then you may use device-specific methods such as
+nm_device_ethernet_get_hw_address().
 

+

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




client :
a NMClient
+
Returns :
a GPtrArray
+containing all the NMDevices.  The returned array is owned by the
+NMClient object and should not be modified. [transfer none][element-type NMClient.Device]
+

 

 

 

-
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

-
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
-

+
nm_client_get_device_by_path ()

+
NMDevice *          nm_client_get_device_by_path        (NMClient *client,
+                                                         const char *object_path);

 

+Gets a NMDevice from a NMClient.
 

+

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




client :
a NMClient
+
object_path :
the object path to search for
Returns :
the NMDevice for the given object_path or NULL if none is found. [transfer none]
+

 

 

 

-
NM_CLIENT_WWAN_ENABLED

-
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
-

+
nm_client_get_device_by_iface ()

+
NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
+                                                         const char *iface);

 

+Gets a NMDevice from a NMClient.
 

+

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




client :
a NMClient
+
iface :
the interface name to search for
Returns :
the NMDevice for the given iface or NULL if none is found. [transfer none]
+

 

 

 

-
NM_CLIENT_WWAN_HARDWARE_ENABLED

-
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
-

+
NMClientActivateFn ()

+
void                (*NMClientActivateFn)               (NMClient *client,
+                                                         NMActiveConnection *active_connection,
+                                                         GError *error,
+                                                         gpointer user_data);

 

 

 

@@ -482,8 +713,11 @@ specific object, like an connection.
 

-

+

+++
@@ -504,7 +738,7 @@ determine which network to connect to given the settings in specific_object :

 

 Gets all the options contained in the configuration.
 

-

 


 
 

 
client :
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
+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
@@ -526,6 +760,17 @@ details of the newly added connection. [
 

 

+
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,
@@ -540,8 +785,11 @@ 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.
 

-

+

+++
@@ -551,7 +799,7 @@ Cannot be used for VPN connections at this time.
 
@@ -564,7 +812,7 @@ using the given device and specific_object :

 

 Gets all the options contained in the configuration.
 

-

 


 
 

 
client :

 
partial :

 an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device and specific_object before being added. [allow-none]
 
 
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
+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
@@ -592,8 +840,11 @@ details of the newly added connection. [
 Deactivates an active NMActiveConnection.
 

-

+

+++
@@ -609,13 +860,16 @@ Deactivates an active 
-
nm_client_get_active_connections ()

-
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

+
nm_client_networking_get_enabled ()

+
gboolean            nm_client_networking_get_enabled    (NMClient *client);

-Gets the active connections.
+Whether networking is enabled or disabled.
 

-

 


 
 

 
client :

 

+

+++
@@ -624,24 +878,27 @@ Gets the active connections.
 
-
+

 


 
 

 
client :

 

 
Returns :
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]
-
+TRUE if networking is enabled, FALSE if networking is disabled
 

 
 

 
 

 

-
nm_client_get_device_by_iface ()

-
NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
-                                                         const char *iface);

+
nm_client_networking_set_enabled ()

+
void                nm_client_networking_set_enabled    (NMClient *client,
+                                                         gboolean enabled);

 

-Gets a NMDevice from a NMClient.
+Enables or disables networking.  When networking is disabled, all controlled
+interfaces are disconnected and deactivated.  When networking is enabled,
+all controlled interfaces are available for activation.
 

-

+

+++
@@ -649,27 +906,25 @@ Gets a 
 
 
-
-
-
-
-
-
+
+

 


 
 

 
client :

 
iface :
the interface name to search for
Returns :
the NMDevice for the given iface or NULL if none is found. [transfer none]
-
enabled :

+TRUE to set networking enabled, FALSE to set networking disabled
 

 
 

 

 

 

-
nm_client_get_device_by_path ()

-
NMDevice *          nm_client_get_device_by_path        (NMClient *client,
-                                                         const char *object_path);

+
nm_client_wireless_get_enabled ()

+
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

 

-Gets a NMDevice from a NMClient.
+Determines whether the wireless is enabled.
 

-

+

+++
@@ -677,29 +932,26 @@ Gets a 
 
 
-
-
-
-
-
+

 


 
 

 
client :

 
object_path :
the object path to search for

 
Returns :
the NMDevice for the given object_path or NULL if none is found. [transfer none]
-
+TRUE if wireless is enabled
 

 
 

 

 

 

-
nm_client_get_devices ()

-
const GPtrArray *   nm_client_get_devices               (NMClient *client);

+
nm_client_wireless_set_enabled ()

+
void                nm_client_wireless_set_enabled      (NMClient *client,
+                                                         gboolean enabled);

 

-Gets all the known network devices.  Use nm_device_get_type() or the
-NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the
-returned array is, and then you may use device-specific methods such as
-nm_device_ethernet_get_hw_address().
+Enables or disables wireless devices.
 

-

+

+++
@@ -707,27 +959,26 @@ returned array is, and then you may use device-specific methods such as
 
-
-
+
+

 


 
 

 
client :

 

 
Returns :
a GPtrArray
-containing all the NMDevices.  The returned array is owned by the
-NMClient object and should not be modified. [transfer none][element-type NMClient.Device]
-
enabled :

+TRUE to enable wireless
 

 
 

 

 

 

-
nm_client_get_logging ()

-
gboolean            nm_client_get_logging               (NMClient *client,
-                                                         char **level,
-                                                         char **domains,
-                                                         GError **error);

+
nm_client_wireless_hardware_get_enabled ()

+
gboolean            nm_client_wireless_hardware_get_enabled
+                                                        (NMClient *client);

 

-Gets NetworkManager current logging level and domains.
+Determines whether the wireless hardware is enabled.
 

-

+

+++
@@ -735,39 +986,25 @@ Gets NetworkManager current logging level and domains.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+

 


 
 

 
client :

 

 
level :
return location for logging level string. [allow-none]
-
domains :
return location for log domains string. The string is
-a list of domains separated by ",". [allow-none]
-
error :
return location for a GError, or NULL. [allow-none]
-
Returns :

-TRUE on success, FALSE otherwise
Returns :

+TRUE if the wireless hardware is enabled
 

 
 

-
Since 0.9.8

 

 

 

-
nm_client_get_manager_running ()

-
gboolean            nm_client_get_manager_running       (NMClient *client);

+
nm_client_wwan_get_enabled ()

+
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

 

-Determines whether the daemon is running.
+Determines whether WWAN is enabled.
 

-

+

+++
@@ -777,23 +1014,24 @@ Determines whether the daemon is running.
 
+TRUE if WWAN is enabled

 


 
 

 
client :

 
Returns :

 
-TRUE if the daemon is running
 

 
 

 

 

 

-
nm_client_get_permission_result ()

-
NMClientPermissionResult nm_client_get_permission_result
-                                                        (NMClient *client,
-                                                         NMClientPermission permission);

+
nm_client_wwan_set_enabled ()

+
void                nm_client_wwan_set_enabled          (NMClient *client,
+                                                         gboolean enabled);

 

-Requests the result of a specific permission, which indicates whether the
-client can or cannot perform the action the permission represents
+Enables or disables WWAN devices.
 

-

+

+++
@@ -801,27 +1039,25 @@ client can or cannot perform the action the permission represents
 
-
-
-
-
-
-
+
+

 


 
 

 
client :

 

 
permission :
the permission for which to return the result, one of NMClientPermission
-
Returns :
the permission's result, one of NMClientPermissionResult
-
enabled :

+TRUE to enable WWAN
 

 
 

 

 

 

-
nm_client_get_state ()

-
NMState             nm_client_get_state                 (NMClient *client);

+
nm_client_wwan_hardware_get_enabled ()

+
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

 

-Gets the current daemon state.
+Determines whether the WWAN hardware is enabled.
 

-

+

+++
@@ -830,21 +1066,24 @@ Gets the current daemon state.
 
-
+

 


 
 

 
client :

 

 
Returns :
the current NMState
-
+TRUE if the WWAN hardware is enabled
 

 
 

 

 

 

-
nm_client_get_version ()

-
const char *        nm_client_get_version               (NMClient *client);

+
nm_client_wimax_get_enabled ()

+
gboolean            nm_client_wimax_get_enabled         (NMClient *client);

 

-Gets NetworkManager version.
+Determines whether WiMAX is enabled.
 

-

+

+++
@@ -853,20 +1092,25 @@ Gets NetworkManager version.
 
-
+

 


 
 

 
client :

 

 
Returns :
string with the version
+TRUE if WiMAX is enabled
 

 
 

 

 

 

-
nm_client_networking_get_enabled ()

-
gboolean            nm_client_networking_get_enabled    (NMClient *client);

+
nm_client_wimax_set_enabled ()

+
void                nm_client_wimax_set_enabled         (NMClient *client,
+                                                         gboolean enabled);

 

-Whether networking is enabled or disabled.
+Enables or disables WiMAX devices.
 

-

+

+++
@@ -874,25 +1118,26 @@ Whether networking is enabled or disabled.
 
-
+
+TRUE to enable WiMAX

 


 
 

 
client :

 

 
Returns :
enabled :

 
-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);

+
nm_client_wimax_hardware_get_enabled ()

+
gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);

 

-Enables or disables networking.  When networking is disabled, all controlled
-interfaces are disconnected and deactivated.  When networking is enabled,
-all controlled interfaces are available for activation.
+Determines whether the WiMAX hardware is enabled.
 

-

+

+++
@@ -900,70 +1145,59 @@ all controlled interfaces are available for activation.
 
-
+
+TRUE if the WiMAX hardware is enabled

 


 
 

 
client :

 

 
enabled :
Returns :

 
-TRUE to set networking enabled, FALSE to set networking disabled
 

 
 

 

 

 

-
nm_client_new ()

-
NMClient *          nm_client_new                       (void);

-

-Creates a new NMClient.
-

-

-Note that this will do blocking D-Bus calls to initialize the
-client. You can use nm_client_new_async() if you want to avoid
-that.
-

+
nm_client_get_version ()

+
const char *        nm_client_get_version               (NMClient *client);

 

-NOTE: NMClient provides information about devices and a mechanism to
-control them.  To access and modify network configuration data, use the
-NMRemoteSettings object.
+Gets NetworkManager version.
 

-

+

+-
-
-+
+
+
+
+
-
+
+
+
+
+
+

 

Returns :
a new NMClient
+


client :
a NMClient
 
Returns :
string with the version

 

 

 

 

-
nm_client_new_async ()

-
void                nm_client_new_async                 (GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

-

-Creates a new NMClient and begins asynchronously initializing it.
-callback will be called when it is done; use
-nm_client_new_finish() to get the result.
-

+
nm_client_get_state ()

+
NMState             nm_client_get_state                 (NMClient *client);

 

-NOTE: NMClient provides information about devices and a mechanism to
-control them.  To access and modify network configuration data, use the
-NMRemoteSettings object.
+Gets the current daemon state.
 

-

+

+++
-
-
+
-
-
-
-
-
-
+
@@ -971,44 +1205,42 @@ control them.  To access and modify network configuration data, use the
 

-
nm_client_new_finish ()

-
NMClient *          nm_client_new_finish                (GAsyncResult *result,
-                                                         GError **error);

+
nm_client_get_manager_running ()

+
gboolean            nm_client_get_manager_running       (NMClient *client);

 

-Gets the result of an nm_client_new_async() call.
+Determines whether the daemon is running.
 

-

 


 
 
cancellable :
a GCancellable, or NULL
+
client :
a NMClient
 
 

 
callback :
callback to call when the client is created
user_data :
data for callback
+
Returns :
the current NMState
 
 

 
 
 

+

+++
-
-
-
-
-
-
+
-
+

 


 
 
result :
a GAsyncResult
-
error :
location for a GError, or NULL
+
client :
a NMClient
 
 

 

 
Returns :
a new NMClient, or NULL on error
+TRUE if the daemon is running
 

 
 

 

 

 

-
nm_client_set_logging ()

-
gboolean            nm_client_set_logging               (NMClient *client,
-                                                         const char *level,
-                                                         const char *domains,
-                                                         GError **error);

+
nm_client_get_active_connections ()

+
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

 

-Sets NetworkManager logging level and/or domains.
+Gets the active connections.
 

-

+

+++
@@ -1016,29 +1248,14 @@ Sets NetworkManager logging level and/or domains.
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
client :

 

 
level :
logging level to set (NULL or an empty string for no change). [allow-none]
-
domains :
logging domains to set. The string should be a list of log
-domains separated by ",". (NULL or an empty string for no change). [allow-none]
-
error :
return location for a GError, or NULL. [allow-none]
-

 
Returns :

-TRUE on success, FALSE otherwisea 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]
+
 

 
 

-
Since 0.9.8

 

 

 

@@ -1048,8 +1265,11 @@ domains separated by ",". (nm_client_networking_set_enabled() instead.
 

-

+

+++
@@ -1066,13 +1286,19 @@ Deprecated; use 
-
nm_client_wimax_get_enabled ()

-
gboolean            nm_client_wimax_get_enabled         (NMClient *client);

+
nm_client_get_permission_result ()

+
NMClientPermissionResult nm_client_get_permission_result
+                                                        (NMClient *client,
+                                                         NMClientPermission permission);

-Determines whether WiMAX is enabled.
+Requests the result of a specific permission, which indicates whether the
+client can or cannot perform the action the permission represents
 

-

 


 
 

 
client :

 

+

+++
@@ -1080,23 +1306,33 @@ Determines whether WiMAX is enabled.
 
+
+
+
+
-
+

 


 
 

 
client :

 

 
permission :
the permission for which to return the result, one of NMClientPermission
+

 
Returns :

-TRUE if WiMAX is enabledthe permission's result, one of NMClientPermissionResult
+
 

 
 

 

 

 

-
nm_client_wimax_hardware_get_enabled ()

-
gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);

+
nm_client_get_logging ()

+
gboolean            nm_client_get_logging               (NMClient *client,
+                                                         char **level,
+                                                         char **domains,
+                                                         GError **error);

 

-Determines whether the WiMAX hardware is enabled.
+Gets NetworkManager current logging level and domains.
 

-

+

+++
@@ -1104,23 +1340,45 @@ Determines whether the WiMAX hardware is enabled.
 
+
+
+
+
+
+
+
+
+
+
+
+
+TRUE on success, FALSE otherwise

 


 
 

 
client :

 

 
level :
return location for logging level string. [allow-none]
+
domains :
return location for log domains string. The string is
+a list of domains separated by ",". [allow-none]
+
error :
return location for a GError, or NULL. [allow-none]
+

 
Returns :

 
-TRUE if the WiMAX hardware is enabled
 

 
 

+
Since 0.9.8

 

 

 

-
nm_client_wimax_set_enabled ()

-
void                nm_client_wimax_set_enabled         (NMClient *client,
-                                                         gboolean enabled);

+
nm_client_set_logging ()

+
gboolean            nm_client_set_logging               (NMClient *client,
+                                                         const char *level,
+                                                         const char *domains,
+                                                         GError **error);

 

-Enables or disables WiMAX devices.
+Sets NetworkManager logging level and/or domains.
 

-

+

+++
@@ -1128,164 +1386,285 @@ Enables or disables WiMAX devices.
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+TRUE on success, FALSE otherwise

 


 
 

 
client :

 

 
enabled :
level :
logging level to set (NULL or an empty string for no change). [allow-none]
+
domains :
logging domains to set. The string should be a list of log
+domains separated by ",". (NULL or an empty string for no change). [allow-none]
+
error :
return location for a GError, or NULL. [allow-none]
+
Returns :

 
-TRUE to enable WiMAX
 

 
 

+
Since 0.9.8

 

 

 

-
nm_client_wireless_get_enabled ()

-
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

+
nm_client_get_connectivity ()

+
NMConnectivityState nm_client_get_connectivity          (NMClient *client);

 

-Determines whether the wireless is enabled.
+Gets the current network connectivity state. Contrast
+nm_client_check_connectivity() and
+nm_client_check_connectivity_async(), which re-check the
+connectivity state first before returning any information.
 

-

+

+++
-
-
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 

 
Returns :

-TRUE if wireless is enabledthe current connectivity state
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wireless_hardware_get_enabled ()

-
gboolean            nm_client_wireless_hardware_get_enabled
-                                                        (NMClient *client);

+
nm_client_check_connectivity ()

+
NMConnectivityState nm_client_check_connectivity        (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GError **error);

 

-Determines whether the wireless hardware is enabled.
+Updates the network connectivity state and returns the (new)
+current state. Contrast nm_client_get_connectivity(), which returns
+the most recent known state without re-checking.
+

+

+This is a blocking call; use nm_client_check_connectivity_async()
+if you do not want to block.
 

-

+

+++
-
+
+
+
+
+
+
+
+
-
+

 


 
 

 
client :
a NMClient
+an NMClient
+
cancellable :
a GCancellable
+
error :
return location for a GError
 
 

 

 
Returns :

-TRUE if the wireless hardware is enabledthe (new) current connectivity state
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wireless_set_enabled ()

-
void                nm_client_wireless_set_enabled      (NMClient *client,
-                                                         gboolean enabled);

+
nm_client_check_connectivity_async ()

+
void                nm_client_check_connectivity_async  (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

-Enables or disables wireless devices.
+Asynchronously updates the network connectivity state and invokes
+callback when complete. Contrast nm_client_get_connectivity(),
+which (immediately) returns the most recent known state without
+re-checking, and nm_client_check_connectivity(), which blocks.
 

-

+

+++
-
-
-
+
+
+
+
+
+
+
+
+
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 
enabled :

-TRUE to enable wireless
cancellable :
a GCancellable
+
callback :
callback to call with the result
user_data :
data for callback.
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_get_enabled ()

-
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

+
nm_client_check_connectivity_finish ()

+
NMConnectivityState nm_client_check_connectivity_finish (NMClient *client,
+                                                         GAsyncResult *result,
+                                                         GError **error);

 

-Determines whether WWAN is enabled.
+Retrieves the result of an nm_client_check_connectivity_async()
+call.
 

-

+

+++
-
+
+
+
+
+
+
+
+
-
+

 


 
 

 
client :
a NMClient
+an NMClient
+
result :
the GAsyncResult
+
error :
return location for a GError
 
 

 

 
Returns :

-TRUE if WWAN is enabledthe (new) current connectivity state
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_hardware_get_enabled ()

-
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

+
nm_client_get_primary_connection ()

+
NMActiveConnection * nm_client_get_primary_connection   (NMClient *client);

 

-Determines whether the WWAN hardware is enabled.
+Gets the NMActiveConnection corresponding to the primary active
+network device.
+

+

+In particular, when there is no VPN active, or the VPN does not
+have the default route, this returns the active connection that has
+the default route. If there is a VPN active with the default route,
+then this function returns the active connection that contains the
+route to the VPN endpoint.
 

-

+

+If there is no default route, or the default route is over a
+non-NetworkManager-recognized device, this will return NULL.
+

+

+++
-
-
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 

 
Returns :

-TRUE if the WWAN hardware is enabledthe appropriate NMActiveConnection, if
+any. [transfer none]
+
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_set_enabled ()

-
void                nm_client_wwan_set_enabled          (NMClient *client,
-                                                         gboolean enabled);

+
nm_client_get_activating_connection ()

+
NMActiveConnection * nm_client_get_activating_connection
+                                                        (NMClient *client);

 

-Enables or disables WWAN devices.
+Gets the NMActiveConnection corresponding to a
+currently-activating connection that is expected to become the new
+"primary-connection" upon successful activation.
 

-

+

+++
-
-
-
+
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 
enabled :

-TRUE to enable WWAN
Returns :
the appropriate NMActiveConnection, if
+any. [transfer none]
+
 

 
 

+
Since 0.9.8.4

 

 
 

 
Property Details

 

+
The "activating-connection" property

+
  "activating-connection"    NMActiveConnection*   : Read

+

+The NMActiveConnection of the activating connection that is
+likely to become the new "primary-connection".
+

+
Since 0.9.8.4

+

+

+

 
The "active-connections" property

 
  "active-connections"       NMObjectArray*        : Read

 
Active connections.

 

 

 

+
The "connectivity" property

+
  "connectivity"             guint                 : Read

+

+The network connectivity state.
+

+
Allowed values: <= 4

+
Default value: 0

+
Since 0.9.8.4

+

+

+

 
The "manager-running" property

 
  "manager-running"          gboolean              : Read

 
Whether NetworkManager is running.

@@ -1300,6 +1679,16 @@ Enables or disables WWAN devices.
 

 

 

+
The "primary-connection" property

+
  "primary-connection"       NMActiveConnection*   : Read

+

+The NMActiveConnection of the device with the default route;
+see nm_client_get_primary_connection() for more details.
+

+
Since 0.9.8.4

+

+

+

 
The "state" property

 
  "state"                    guint                 : Read

 

@@ -1370,8 +1759,11 @@ The NetworkManager version.
 

 Notifies that a NMDevice is added.
 

-

+

+++
@@ -1379,7 +1771,7 @@ Notifies that a 
 
-
@@ -1398,8 +1790,11 @@ Notifies that a 
 Notifies that a NMDevice is removed.
 

-

 


 
 

 
client :

 
device :
the new device. [type NMClient.Device]
+the new device. [type NMClient.Device]
 
 

 

+

+++
@@ -1407,7 +1802,7 @@ Notifies that a 
 
-
@@ -1427,8 +1822,11 @@ Notifies that a 
 Notifies that a permission has changed
 

-

 


 
 

 
client :

 
device :
the removed device. [type NMClient.Device]
+the removed device. [type NMClient.Device]
 
 

 

+

+++
 
@@ -1455,6 +1853,6 @@ Notifies that a permission has changed
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 597e818d..aff13165 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -3,12 +3,12 @@
 
 
 NMDHCP4Config
-
+
 
 
 
 
-
+
 
 
 
@@ -46,11 +46,11 @@
 
                    NMDHCP4Config;
                     NMDHCP4ConfigClass;
 #define             NM_DHCP4_CONFIG_OPTIONS
-const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
-                                                         const char *option);
-GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
 GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
                                                          const char *object_path);
+GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
+const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
+                                                         const char *option);
 

@@ -114,28 +114,31 @@ NMDHCP4Config implements
 

-
nm_dhcp4_config_get_one_option ()

-
const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
-                                                         const char *option);

+
nm_dhcp4_config_new ()

+
GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
+                                                         const char *object_path);

 

-Gets one option by option name.
+Creates a new NMDHCP4Config.
 

-

 


 

 
client :

 
 
 
 

+

+++
-
-
+
-
-
+
+
-
+

 


 
 
config :
a NMDHCP4Config
+
connection :
the DBusGConnection
 
 

 
option :
the option to retrieve
object_path :
the DBus object path of the device
 

 

 
Returns :
the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.a new configuration. [transfer full]
+
 

 
 

@@ -147,8 +150,11 @@ configuration, and must not be modified.

 

+

+++
 
@@ -166,28 +172,31 @@ This is the internal copy used by the configuration, and must not be modified. <
 
 

 

-
nm_dhcp4_config_new ()

-
GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);

+
nm_dhcp4_config_get_one_option ()

+
const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
+                                                         const char *option);

 

-Creates a new NMDHCP4Config.
+Gets one option by option name.
 

-

 


 

 
config :

+

+++
 
-
-
+
-
-
+
+
-
+

 


 
connection :
the DBusGConnection
+
config :
a NMDHCP4Config
 
 

 
object_path :
the DBus object path of the device
option :
the option to retrieve
 

 

 
Returns :
a new configuration. [transfer full]
-the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.
 

 
 

@@ -202,14 +211,13 @@ Creates a new GHashTable containing options of the configuration.
 

 

-Type: GLib.HashTable
-Element-Type: utf8,GObject.Value
+Type: GLib.HashTable(utf8,GObject.Value)
 

 

 
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index a6be2c66..cc5b4931 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -3,12 +3,12 @@
 
 
 NMDHCP6Config
-
+
 
 
 
 
-
+
 
 
 
@@ -46,11 +46,11 @@
 
                    NMDHCP6Config;
                     NMDHCP6ConfigClass;
 #define             NM_DHCP6_CONFIG_OPTIONS
-const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
-                                                         const char *option);
-GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
 GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
                                                          const char *object_path);
+GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
+const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
+                                                         const char *option);
 

 
 

@@ -114,28 +114,31 @@ NMDHCP6Config implements
 

 

 

-
nm_dhcp6_config_get_one_option ()

-
const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
-                                                         const char *option);

+
nm_dhcp6_config_new ()

+
GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
+                                                         const char *object_path);

 

-Gets one option by option name.
+Creates a new NMDHCP6Config.
 

-

+

+++
-
-
+
-
-
+
+
-
+

 


 
 
config :
a NMDHCP6Config
+
connection :
the DBusGConnection
 
 

 
option :
the option to retrieve
object_path :
the DBus object path of the device
 

 

 
Returns :
the configuration option's value. This is the internal string used by the
-configuration, and must not be modified.a new configuration. [transfer full]
+
 

 
 

@@ -147,8 +150,11 @@ configuration, and must not be modified.

 

+

+++
 
@@ -166,28 +172,31 @@ This is the internal copy used by the configuration, and must not be modified. <
 
 

 

-
nm_dhcp6_config_new ()

-
GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);

+
nm_dhcp6_config_get_one_option ()

+
const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
+                                                         const char *option);

 

-Creates a new NMDHCP6Config.
+Gets one option by option name.
 

-

 


 

 
config :

+

+++
 
-
-
+
-
-
+
+
-
+

 


 
connection :
the DBusGConnection
+
config :
a NMDHCP6Config
 
 

 
object_path :
the DBus object path of the device
option :
the option to retrieve
 

 

 
Returns :
a new configuration. [transfer full]
-the configuration option's value. This is the internal string used by the
+configuration, and must not be modified.
 

 
 

@@ -202,14 +211,13 @@ Creates a new GHashTable containing options of the configuration.
 

 

-Type: GLib.HashTable
-Element-Type: utf8,GObject.Value
+Type: GLib.HashTable(utf8,GObject.Value)
 

 

 

 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index e0f5f25a..621a183b 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -3,12 +3,12 @@
 
 
 NMDevice
-
+
 
 
 
 
-
+
 
 
 
@@ -45,68 +45,68 @@
 
 

 
Synopsis

-
                    NMDevice;
-                    NMDeviceClass;
-void                (*NMDeviceDeactivateFn)             (NMDevice *device,
-                                                         GError *error,
-                                                         gpointer user_data);
-#define             NM_DEVICE_ACTIVE_CONNECTION
-#define             NM_DEVICE_AUTOCONNECT
-#define             NM_DEVICE_AVAILABLE_CONNECTIONS
-#define             NM_DEVICE_CAPABILITIES
-#define             NM_DEVICE_DEVICE_TYPE
-#define             NM_DEVICE_DHCP4_CONFIG
-#define             NM_DEVICE_DHCP6_CONFIG
+
#define             NM_DEVICE_DEVICE_TYPE
+#define             NM_DEVICE_UDI
+#define             NM_DEVICE_INTERFACE
+#define             NM_DEVICE_IP_INTERFACE
 #define             NM_DEVICE_DRIVER
 #define             NM_DEVICE_DRIVER_VERSION
-#define             NM_DEVICE_FIRMWARE_MISSING
 #define             NM_DEVICE_FIRMWARE_VERSION
-#define             NM_DEVICE_INTERFACE
+#define             NM_DEVICE_CAPABILITIES
+#define             NM_DEVICE_MANAGED
+#define             NM_DEVICE_AUTOCONNECT
+#define             NM_DEVICE_FIRMWARE_MISSING
 #define             NM_DEVICE_IP4_CONFIG
+#define             NM_DEVICE_DHCP4_CONFIG
 #define             NM_DEVICE_IP6_CONFIG
-#define             NM_DEVICE_IP_INTERFACE
-#define             NM_DEVICE_MANAGED
-#define             NM_DEVICE_PRODUCT
+#define             NM_DEVICE_DHCP6_CONFIG
 #define             NM_DEVICE_STATE
 #define             NM_DEVICE_STATE_REASON
-#define             NM_DEVICE_UDI
+#define             NM_DEVICE_ACTIVE_CONNECTION
+#define             NM_DEVICE_AVAILABLE_CONNECTIONS
 #define             NM_DEVICE_VENDOR
-gboolean            nm_device_connection_compatible     (NMDevice *device,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
-void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
-                                                         gpointer user_data);
-GSList *            nm_device_filter_connections        (NMDevice *device,
-                                                         const GSList *connections);
-NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);
-gboolean            nm_device_get_autoconnect           (NMDevice *device);
-const GPtrArray *   nm_device_get_available_connections (NMDevice *device);
-NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
+#define             NM_DEVICE_PRODUCT
+                    NMDevice;
+                    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);
 NMDeviceType        nm_device_get_device_type           (NMDevice *device);
-NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);
-NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
+const char *        nm_device_get_udi                   (NMDevice *device);
 const char *        nm_device_get_driver                (NMDevice *device);
 const char *        nm_device_get_driver_version        (NMDevice *device);
-gboolean            nm_device_get_firmware_missing      (NMDevice *device);
 const char *        nm_device_get_firmware_version      (NMDevice *device);
-const char *        nm_device_get_iface                 (NMDevice *device);
+NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
+gboolean            nm_device_get_managed               (NMDevice *device);
+gboolean            nm_device_get_autoconnect           (NMDevice *device);
+void                nm_device_set_autoconnect           (NMDevice *device,
+                                                         gboolean autoconnect);
+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);
-const char *        nm_device_get_ip_iface              (NMDevice *device);
-gboolean            nm_device_get_managed               (NMDevice *device);
-const char *        nm_device_get_product               (NMDevice *device);
+NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
 NMDeviceState       nm_device_get_state                 (NMDevice *device);
 NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
                                                          NMDeviceStateReason *reason);
-const char *        nm_device_get_udi                   (NMDevice *device);
+NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);
+const GPtrArray *   nm_device_get_available_connections (NMDevice *device);
+const char *        nm_device_get_product               (NMDevice *device);
 const char *        nm_device_get_vendor                (NMDevice *device);
-GObject *           nm_device_new                       (DBusGConnection *connection,
-                                                         const char *path);
-void                nm_device_set_autoconnect           (NMDevice *device,
-                                                         gboolean autoconnect);
+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);
+gboolean            nm_device_connection_compatible     (NMDevice *device,
+                                                         NMConnection *connection,
+                                                         GError **error);
 

 

 

@@ -174,310 +174,250 @@ NMDevice implements
 

 
Details

 

-
NMDevice

-
typedef struct _NMDevice NMDevice;

-

-

-

-

-

-
NMDeviceClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Signals */
-	void (*state_changed) (NMDevice *device,
-	                       NMDeviceState new_state,
-	                       NMDeviceState old_state,
-	                       NMDeviceStateReason reason);
-
-	gboolean (*connection_compatible) (NMDevice *device,
-	                                   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);
-} NMDeviceClass;
+
NM_DEVICE_DEVICE_TYPE

+
#define NM_DEVICE_DEVICE_TYPE "device-type"
 

 

 

 

 

 

-
NMDeviceDeactivateFn ()

-
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NM_DEVICE_UDI

+
#define NM_DEVICE_UDI "udi"
+

 

 

 

 

 

-
NM_DEVICE_ACTIVE_CONNECTION

-
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+
NM_DEVICE_INTERFACE

+
#define NM_DEVICE_INTERFACE "interface"
 

 

 

 

 

 

-
NM_DEVICE_AUTOCONNECT

-
#define NM_DEVICE_AUTOCONNECT "autoconnect"
+
NM_DEVICE_IP_INTERFACE

+
#define NM_DEVICE_IP_INTERFACE "ip-interface"
 

 

 

 

 

 

-
NM_DEVICE_AVAILABLE_CONNECTIONS

-
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
+
NM_DEVICE_DRIVER

+
#define NM_DEVICE_DRIVER "driver"
 

 

 

 

 

 

-
NM_DEVICE_CAPABILITIES

-
#define NM_DEVICE_CAPABILITIES "capabilities"
+
NM_DEVICE_DRIVER_VERSION

+
#define NM_DEVICE_DRIVER_VERSION "driver-version"
 

 

 

 

 

 

-
NM_DEVICE_DEVICE_TYPE

-
#define NM_DEVICE_DEVICE_TYPE "device-type"
+
NM_DEVICE_FIRMWARE_VERSION

+
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 

 

 

 

 

 

-
NM_DEVICE_DHCP4_CONFIG

-
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
+
NM_DEVICE_CAPABILITIES

+
#define NM_DEVICE_CAPABILITIES "capabilities"
 

 

 

 

 

 

-
NM_DEVICE_DHCP6_CONFIG

-
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
+
NM_DEVICE_MANAGED

+
#define NM_DEVICE_MANAGED "managed"
 

 

 

 

 

 

-
NM_DEVICE_DRIVER

-
#define NM_DEVICE_DRIVER "driver"
+
NM_DEVICE_AUTOCONNECT

+
#define NM_DEVICE_AUTOCONNECT "autoconnect"
 

 

 

 

 

 

-
NM_DEVICE_DRIVER_VERSION

-
#define NM_DEVICE_DRIVER_VERSION "driver-version"
+
NM_DEVICE_FIRMWARE_MISSING

+
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

 

 

 

 

 

-
NM_DEVICE_FIRMWARE_MISSING

-
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
+
NM_DEVICE_IP4_CONFIG

+
#define NM_DEVICE_IP4_CONFIG "ip4-config"
 

 

 

 

 

 

-
NM_DEVICE_FIRMWARE_VERSION

-
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
+
NM_DEVICE_DHCP4_CONFIG

+
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 

 

 

 

 

 

-
NM_DEVICE_INTERFACE

-
#define NM_DEVICE_INTERFACE "interface"
+
NM_DEVICE_IP6_CONFIG

+
#define NM_DEVICE_IP6_CONFIG "ip6-config"
 

 

 

 

 

 

-
NM_DEVICE_IP4_CONFIG

-
#define NM_DEVICE_IP4_CONFIG "ip4-config"
+
NM_DEVICE_DHCP6_CONFIG

+
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 

 

 

 

 

 

-
NM_DEVICE_IP6_CONFIG

-
#define NM_DEVICE_IP6_CONFIG "ip6-config"
+
NM_DEVICE_STATE

+
#define NM_DEVICE_STATE "state"
 

 

 

 

 

 

-
NM_DEVICE_IP_INTERFACE

-
#define NM_DEVICE_IP_INTERFACE "ip-interface"
+
NM_DEVICE_STATE_REASON

+
#define NM_DEVICE_STATE_REASON "state-reason"
 

 

 

 

 

 

-
NM_DEVICE_MANAGED

-
#define NM_DEVICE_MANAGED "managed"
+
NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 

 

 

 

 

 

-
NM_DEVICE_PRODUCT

-
#define NM_DEVICE_PRODUCT "product"
+
NM_DEVICE_AVAILABLE_CONNECTIONS

+
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 

 

 

 

 

 

-
NM_DEVICE_STATE

-
#define NM_DEVICE_STATE "state"
+
NM_DEVICE_VENDOR

+
#define NM_DEVICE_VENDOR "vendor"
 

 

 

 

 

 

-
NM_DEVICE_STATE_REASON

-
#define NM_DEVICE_STATE_REASON "state-reason"
+
NM_DEVICE_PRODUCT

+
#define NM_DEVICE_PRODUCT "product"
 

 

 

 

 

 

-
NM_DEVICE_UDI

-
#define NM_DEVICE_UDI "udi"
-

+
NMDevice

+
typedef struct _NMDevice NMDevice;

 

 

 

 

 

-
NM_DEVICE_VENDOR

-
#define NM_DEVICE_VENDOR "vendor"
+
NMDeviceClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Signals */
+	void (*state_changed) (NMDevice *device,
+	                       NMDeviceState new_state,
+	                       NMDeviceState old_state,
+	                       NMDeviceStateReason reason);
+
+	gboolean (*connection_compatible) (NMDevice *device,
+	                                   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);
+} NMDeviceClass;
 

 

 

 

 

 

-
nm_device_connection_compatible ()

-
gboolean            nm_device_connection_compatible     (NMDevice *device,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-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.
-

+
nm_device_new ()

+
GObject *           nm_device_new                       (DBusGConnection *connection,
+                                                         const char *path);

 

-This function does the same as nm_device_connection_valid(), i.e. checking
-compatibility of the given device and connection. But, in addition, it sets
-GError when FALSE is returned.
+Creates a new NMDevice.
 

-

+

+++
-
-
-
-
-
-
-
+
+
-
-
-
-

 


 
 
device :
an NMDevice to validate connection against

 
connection :
an NMConnection to validate against device
+the DBusGConnection
 
 

 
error :
return location for a GError, or NULL
-
path :
the DBus object path of the device
 

 

 
Returns :

-TRUE if the connection may be activated with this device, FALSE
-if is incompatible with the device's capabilities and characteristics.

-

-

-

-
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.
-

-

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


device :
an NMDevice to validate connection against
connection :
an NMConnection to validate against device
+a new device. [transfer full]
 
 
Returns :

-TRUE if the connection may be activated with this device, FALSE
-if is incompatible with the device's capabilities and characteristics.

 
 

 

 

 

-
nm_device_disconnect ()

-
void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
-                                                         gpointer user_data);

+
nm_device_get_iface ()

+
const char *        nm_device_get_iface                 (NMDevice *device);

 

-Disconnects the device if currently connected, and prevents the device from
-automatically connecting to networks until the next manual network connection
-request.
+Gets the interface name of the NMDevice.
 

-

+

+++
@@ -485,67 +425,52 @@ request.
 
-
-
-
-
-
-
+
+

 


 
 

 
device :

 

 
callback :
callback to be called when disconnect
-operation completes. [scope async][allow-none]
-
user_data :
caller-specific data passed to callback. [closure]
-
Returns :
the interface of the device. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_filter_connections ()

-
GSList *            nm_device_filter_connections        (NMDevice *device,
-                                                         const GSList *connections);

+
nm_device_get_ip_iface ()

+
const char *        nm_device_get_ip_iface              (NMDevice *device);

 

-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. To get the full list of connections see
-nm_remote_settings_list_connections().
+Gets the IP interface name of the NMDevice over which IP traffic flows
+when the device is in the ACTIVATED state.
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
device :
an NMDevice to filter connections for
connections :
a list of NMConnection objects to filter. [element-type NetworkManager.Connection]
+a NMDevice
 
 

 

 
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]
-the IP traffic interface of the device. This is the internal string
+used by the device, and must not be modified.
 

 
 

 

 

 

-
nm_device_get_active_connection ()

-
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);

+
nm_device_get_device_type ()

+
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

 

-Gets the NMActiveConnection object which owns this device during activation.
+Returns the numeric type of the NMDevice, ie ethernet, wifi, etc.
 

-

+

+++
@@ -554,22 +479,23 @@ Gets the Returns :

-
+

 


 
 

 
device :
the NMActiveConnection or NULL if the device is
-not part of an active connection. [transfer none]
-the device type
 

 
 

 

 

 

-
nm_device_get_autoconnect ()

-
gboolean            nm_device_get_autoconnect           (NMDevice *device);

+
nm_device_get_udi ()

+
const char *        nm_device_get_udi                   (NMDevice *device);

 

-Whether the NMDevice can be autoconnected.
+Gets the Unique Device Identifier of the NMDevice.
 

-

+

+++
@@ -578,22 +504,25 @@ Whether the Returns :

-
+

 


 
 

 
device :

-TRUE if the device is allowed to be autoconnectedthe 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.
 

 
 

 

 

 

-
nm_device_get_available_connections ()

-
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);

+
nm_device_get_driver ()

+
const char *        nm_device_get_driver                (NMDevice *device);

 

-Gets the NMRemoteConnections currently known to the daemon that could
-be activated on device.
+Gets the driver of the NMDevice.
 

-

+

+++
@@ -602,24 +531,24 @@ be activated on device.
 
-
+

 


 
 

 
device :

 

 
Returns :
the GPtrArray
-containing NMRemoteConnections. This is the internal copy used by
-the connection, and must not be modified. [element-type NMClient.RemoteConnection]
-the driver of the device. This is the internal string used by the
+device, and must not be modified.
 

 
 

-
Since 0.9.8

 

 

 

-
nm_device_get_capabilities ()

-
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

+
nm_device_get_driver_version ()

+
const char *        nm_device_get_driver_version        (NMDevice *device);

 

-Gets the device' capabilities.
+Gets the driver version of the NMDevice.
 

-

+

+++
@@ -628,20 +557,24 @@ Gets the device' capabilities.
 
-
+

 


 
 

 
device :

 

 
Returns :
the capabilitiesthe version of the device driver. 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);

+
nm_device_get_firmware_version ()

+
const char *        nm_device_get_firmware_version      (NMDevice *device);

 

-Returns the numeric type of the NMDevice, ie ethernet, wifi, etc.
+Gets the firmware version of the NMDevice.
 

-

+

+++
@@ -650,20 +583,24 @@ Returns the numeric type of the Returns :

-
+

 


 
 

 
device :
the device typethe firmware version of the device. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_get_dhcp4_config ()

-
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

+
nm_device_get_capabilities ()

+
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

 

-Gets the current NMDHCP4Config associated with the NMDevice.
+Gets the device' capabilities.
 

-

+

+++
@@ -672,22 +609,23 @@ Gets the current 
 
-
+

 


 
 

 
device :

 
Returns :
the NMDHCP4Config or NULL if the device is not activated or not
-using DHCP. [transfer none]
-the capabilities
 

 
 

 

 

 

-
nm_device_get_dhcp6_config ()

-
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

+
nm_device_get_managed ()

+
gboolean            nm_device_get_managed               (NMDevice *device);

 

-Gets the current NMDHCP6Config associated with the NMDevice.
+Whether the NMDevice is managed by NetworkManager.
 

-

+

+++
@@ -696,22 +634,24 @@ Gets the current 
 
-
+

 


 
 

 
device :

 
Returns :
the NMDHCP6Config or NULL if the device is not activated or not
-using DHCP. [transfer none]
-
+TRUE if the device is managed by NetworkManager
 

 
 

 

 

 

-
nm_device_get_driver ()

-
const char *        nm_device_get_driver                (NMDevice *device);

+
nm_device_get_autoconnect ()

+
gboolean            nm_device_get_autoconnect           (NMDevice *device);

 

-Gets the driver of the NMDevice.
+Whether the NMDevice can be autoconnected.
 

-

+

+++
@@ -720,21 +660,25 @@ Gets the driver of the 
 
-
+

 


 
 

 
device :

 
Returns :
the driver of the device. This is the internal string used by the
-device, and must not be modified.
+TRUE if the device is allowed to be autoconnected
 

 
 

 

 

 

-
nm_device_get_driver_version ()

-
const char *        nm_device_get_driver_version        (NMDevice *device);

+
nm_device_set_autoconnect ()

+
void                nm_device_set_autoconnect           (NMDevice *device,
+                                                         gboolean autoconnect);

 

-Gets the driver version of the NMDevice.
+Enables or disables automatic activation of the NMDevice.
 

-

+

+++
@@ -742,9 +686,9 @@ Gets the driver version of the Returns :

-
+
+

 


 
 

 
device :
the version of the device driver. This is the internal string used by the
-device, and must not be modified.
autoconnect :

+TRUE to enable autoconnecting
 

 
 

@@ -757,8 +701,11 @@ device, and must not be modified.
 Indicates that firmware required for the device's operation is likely
 to be missing.
 

-

+

+++
@@ -776,13 +723,16 @@ to be missing.

-
nm_device_get_firmware_version ()

-
const char *        nm_device_get_firmware_version      (NMDevice *device);

+
nm_device_get_ip4_config ()

+
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

 

-Gets the firmware version of the NMDevice.
+Gets the current NMIP4Config associated with the NMDevice.
 

-

 


 
 

 
device :

 
 
 

+

+++
@@ -791,21 +741,24 @@ Gets the firmware version of the Returns :

-
+

 


 
 

 
device :
the firmware version of the device. This is the internal string used by the
-device, and must not be modified.the NMIP4Config or NULL if the device is not activated. [transfer none]
+
 

 
 

 

 

 

-
nm_device_get_iface ()

-
const char *        nm_device_get_iface                 (NMDevice *device);

+
nm_device_get_dhcp4_config ()

+
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

 

-Gets the interface name of the NMDevice.
+Gets the current NMDHCP4Config associated with the NMDevice.
 

-

+

+++
@@ -814,21 +767,25 @@ Gets the interface name of the Returns :

-
+

 


 
 

 
device :
the interface of the device. This is the internal string used by the
-device, and must not be modified.the NMDHCP4Config or NULL if the device is not activated or not
+using DHCP. [transfer none]
+
 

 
 

 

 

 

-
nm_device_get_ip4_config ()

-
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

+
nm_device_get_ip6_config ()

+
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

 

-Gets the current NMIP4Config associated with the NMDevice.
+Gets the current NMIP6Config associated with the NMDevice.
 

-

+

+++
@@ -837,7 +794,7 @@ Gets the current 
 
-
@@ -845,13 +802,16 @@ Gets the current 
 

 

-
nm_device_get_ip6_config ()

-
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

+
nm_device_get_dhcp6_config ()

+
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

 

-Gets the current NMIP6Config associated with the NMDevice.
+Gets the current NMDHCP6Config associated with the NMDevice.
 

-

 


 
 

 
device :

 
Returns :
the NMIP4Config or NULL if the device is not activated. [transfer none]
+the NMIP6Config or NULL if the device is not activated. [transfer none]
 
 

 

+

+++
@@ -860,7 +820,8 @@ Gets the current 
 
-
@@ -868,14 +829,16 @@ Gets the current 
 

 

-
nm_device_get_ip_iface ()

-
const char *        nm_device_get_ip_iface              (NMDevice *device);

+
nm_device_get_state ()

+
NMDeviceState       nm_device_get_state                 (NMDevice *device);

 

-Gets the IP interface name of the NMDevice over which IP traffic flows
-when the device is in the ACTIVATED state.
+Gets the current NMDevice state.
 

-

 


 
 

 
device :

 
Returns :
the NMIP6Config or NULL if the device is not activated. [transfer none]
+the NMDHCP6Config or NULL if the device is not activated or not
+using DHCP. [transfer none]
 
 

 

+

+++
@@ -884,21 +847,25 @@ when the device is in the ACTIVATED state.
 
-
+

 


 
 

 
device :

 

 
Returns :
the IP traffic interface of the device. This is the internal string
-used by the device, and must not be modified.the current device state
 

 
 

 

 

 

-
nm_device_get_managed ()

-
gboolean            nm_device_get_managed               (NMDevice *device);

+
nm_device_get_state_reason ()

+
NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
+                                                         NMDeviceStateReason *reason);

 

-Whether the NMDevice is managed by NetworkManager.
+Gets the current NMDevice state (return value) and the reason for entering
+the state (reason argument).
 

-

+

+++
@@ -906,22 +873,29 @@ Whether the reason :

+
+
+
-
+

 


 
 

 
device :
location to store reason (NMDeviceStateReason), or NULL. [out][allow-none]
+

 
Returns :

-TRUE if the device is managed by NetworkManagerthe current device state
 

 
 

 

 

 

-
nm_device_get_product ()

-
const char *        nm_device_get_product               (NMDevice *device);

+
nm_device_get_active_connection ()

+
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);

 

-Gets the product string of the NMDevice.
+Gets the NMActiveConnection object which owns this device during activation.
 

-

+

+++
@@ -930,21 +904,26 @@ Gets the product string of the Returns :

-
+

 


 
 

 
device :
the product name of the device. This is the internal string used by the
-device, and must not be modified.the NMActiveConnection or NULL if the device is
+not part of an active connection. [transfer none]
+
 

 
 

 

 

 

-
nm_device_get_state ()

-
NMDeviceState       nm_device_get_state                 (NMDevice *device);

+
nm_device_get_available_connections ()

+
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);

 

-Gets the current NMDevice state.
+Gets the NMRemoteConnections currently known to the daemon that could
+be activated on device.
 

-

+

+++
@@ -953,22 +932,27 @@ Gets the current 
 
-
+

 


 
 

 
device :

 
Returns :
the current device statethe GPtrArray
+containing NMRemoteConnections. This is the internal copy used by
+the connection, and must not be modified. [element-type NMClient.RemoteConnection]
+
 

 
 

+
Since 0.9.8

 

 

 

-
nm_device_get_state_reason ()

-
NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
-                                                         NMDeviceStateReason *reason);

+
nm_device_get_product ()

+
const char *        nm_device_get_product               (NMDevice *device);

 

-Gets the current NMDevice state (return value) and the reason for entering
-the state (reason argument).
+Gets the product string of the NMDevice.
 

-

+

+++
@@ -976,26 +960,64 @@ the state (reason argument).
 
-
-
+
+
+
+

 


 
 

 
device :

 

 
reason :
location to store reason (NMDeviceStateReason), or NULL. [out][allow-none]
+
Returns :
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);

+

+Gets the vendor string of the NMDevice.
+

+

++++
+
+
+
+
-
+




device :
a NMDevice
 
 

 

 
Returns :
the current device statethe vendor name of the device. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_get_udi ()

-
const char *        nm_device_get_udi                   (NMDevice *device);

+
NMDeviceDeactivateFn ()

+
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
+                                                         GError *error,
+                                                         gpointer user_data);

 

-Gets the Unique Device Identifier of the NMDevice.
 

-

+
+

+

+
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.
+

+

+++
@@ -1003,85 +1025,144 @@ Gets the Unique Device Identifier of the 
 
-
-
+
+
+
+
+
+

 


 
 

 
device :

 
Returns :
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.
callback :
callback to be called when disconnect
+operation completes. [scope async][allow-none]
+
user_data :
caller-specific data passed to callback. [closure]
+
 

 
 

 

 

 

-
nm_device_get_vendor ()

-
const char *        nm_device_get_vendor                (NMDevice *device);

+
nm_device_filter_connections ()

+
GSList *            nm_device_filter_connections        (NMDevice *device,
+                                                         const GSList *connections);

 

-Gets the vendor string of the NMDevice.
+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. To get the full list of connections see
+nm_remote_settings_list_connections().
 

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
device :
a NMDevice
+an NMDevice to filter connections for
connections :
a list of NMConnection objects to filter. [element-type NetworkManager.Connection]
 
 

 

 
Returns :
the vendor name of the device. This is the internal string used by the
-device, and must not be modified.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_new ()

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

+
nm_device_connection_valid ()

+
gboolean            nm_device_connection_valid          (NMDevice *device,
+                                                         NMConnection *connection);

 

-Creates a new NMDevice.
+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.
 

-

+

+++
-
-
+
+
-
-
+
+
-
+

 


 
 
connection :
the DBusGConnection
-
device :
an NMDevice to validate connection against
 

 
path :
the DBus object path of the device
connection :
an NMConnection to validate against device
+
 

 

 
Returns :
a new device. [transfer full]
-
+TRUE if the connection may be activated with this device, FALSE
+if is incompatible with the device's capabilities and characteristics.
 

 
 

 

 

 

-
nm_device_set_autoconnect ()

-
void                nm_device_set_autoconnect           (NMDevice *device,
-                                                         gboolean autoconnect);

+
nm_device_connection_compatible ()

+
gboolean            nm_device_connection_compatible     (NMDevice *device,
+                                                         NMConnection *connection,
+                                                         GError **error);

 

-Enables or disables automatic activation of the NMDevice.
+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.
+

+

+This function does the same as nm_device_connection_valid(), i.e. checking
+compatibility of the given device and connection. But, in addition, it sets
+GError when FALSE is returned.
 

-

+

+++
-
+
+
+
+
-
+
+
+
+
+
+TRUE if the connection may be activated with this device, FALSE
+if is incompatible with the device's capabilities and characteristics.

 


 
 

 
device :
a NMDevice
+an NMDevice to validate connection against
connection :
an NMConnection to validate against device
 
 

 
autoconnect :
error :
return location for a GError, or NULL
+
Returns :

 
-TRUE to enable autoconnecting
 

 
 

@@ -1291,8 +1372,11 @@ The vendor string of the device.
 

 Notifies the state change of a NMDevice.
 

-

+

+++
@@ -1321,6 +1405,6 @@ Notifies the state change of a 
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 344031f5..8f20351f 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceAdsl
-
+
 
 
 
 
-
+
 
 
 
@@ -43,15 +43,15 @@
 

 


 
 

 
device :

 

 
Synopsis

-
                    NMDeviceAdsl;
-                    NMDeviceAdslClass;
-enum                NMDeviceAdslError;
-#define             NM_DEVICE_ADSL_CARRIER
+
enum                NMDeviceAdslError;
 #define             NM_DEVICE_ADSL_ERROR
 GQuark              nm_device_adsl_error_quark          (void);
-gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
+#define             NM_DEVICE_ADSL_CARRIER
+                    NMDeviceAdsl;
+                    NMDeviceAdslClass;
 GObject *           nm_device_adsl_new                  (DBusGConnection *connection,
                                                          const char *path);
+gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
 

 

 

@@ -83,31 +83,6 @@ NMDeviceAdsl implements
 

 
Details

 

-
NMDeviceAdsl

-
typedef struct _NMDeviceAdsl NMDeviceAdsl;

-

-

-

-

-

-
NMDeviceAdslClass

-
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);
-} NMDeviceAdslClass;
-

-

-

-

-

-

 
enum NMDeviceAdslError

 
typedef enum {
 	NM_DEVICE_ADSL_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
@@ -115,8 +90,11 @@ NMDeviceAdsl implements
 	NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION, /*< nick=InvalidAdslConnection >*/
 } NMDeviceAdslError;
 

-

+

+++
@@ -138,14 +116,6 @@ NMDeviceAdsl implements
 

-
NM_DEVICE_ADSL_CARRIER

-
#define NM_DEVICE_ADSL_CARRIER "carrier"
-

-

-

-

-

-

 
NM_DEVICE_ADSL_ERROR

 
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
 

@@ -159,8 +129,11 @@ NMDeviceAdsl implements
 

 Registers an error quark for NMDeviceAdsl if necessary.
 

-

 


 
 

 
NM_DEVICE_ADSL_ERROR_UNKNOWN

 
 

+

+++
@@ -169,26 +142,36 @@ Registers an error quark for 
-
nm_device_adsl_get_carrier ()

-
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);

+
NM_DEVICE_ADSL_CARRIER

+
#define NM_DEVICE_ADSL_CARRIER "carrier"
+

+

+

+
+

+

+
NMDeviceAdsl

+
typedef struct _NMDeviceAdsl NMDeviceAdsl;

+

+

+

+

+

+
NMDeviceAdslClass

+
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);
+} NMDeviceAdslClass;
+

 

-Whether the device has carrier.
 

-

 


 

 
Returns :

 the error quark used for NMDeviceAdsl errors.

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


device :
a NMDeviceAdsl
-
Returns :

-TRUE if the device has carrier

 

 

 

@@ -198,8 +181,11 @@ Whether the device has carrier.
 

 Creates a new NMDeviceAdsl.
 

-

+

+++
@@ -218,6 +204,32 @@ Creates a new 
 

 


 
 

 
connection :

 

+

+

+
nm_device_adsl_get_carrier ()

+
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);

+

+Whether the device has carrier.
+

+

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




device :
a NMDeviceAdsl
+
Returns :

+TRUE if the device has carrier

+

 

 

 
Property Details

@@ -233,6 +245,6 @@ Whether the device has carrier.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 04c6f0a7..00223fb2 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceBond
-
+
 
 
 
 
-
+
 
 
 
@@ -43,19 +43,19 @@
 

 

 
Synopsis

-
                    NMDeviceBond;
-                    NMDeviceBondClass;
-enum                NMDeviceBondError;
-#define             NM_DEVICE_BOND_CARRIER
+
enum                NMDeviceBondError;
 #define             NM_DEVICE_BOND_ERROR
+GQuark              nm_device_bond_error_quark          (void);
 #define             NM_DEVICE_BOND_HW_ADDRESS
+#define             NM_DEVICE_BOND_CARRIER
 #define             NM_DEVICE_BOND_SLAVES
-GQuark              nm_device_bond_error_quark          (void);
-gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);
-const char *        nm_device_bond_get_hw_address       (NMDeviceBond *device);
-const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);
+                    NMDeviceBond;
+                    NMDeviceBondClass;
 GObject *           nm_device_bond_new                  (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_bond_get_hw_address       (NMDeviceBond *device);
+gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);
+const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);
 

 

 

@@ -89,31 +89,6 @@ NMDeviceBond implements
 

 
Details

 

-
NMDeviceBond

-
typedef struct _NMDeviceBond NMDeviceBond;

-

-

-

-

-

-
NMDeviceBondClass

-
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);
-} NMDeviceBondClass;
-

-

-

-

-

-

 
enum NMDeviceBondError

 
typedef enum {
 	NM_DEVICE_BOND_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
@@ -122,8 +97,11 @@ NMDeviceBond implements
 	NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
 } NMDeviceBondError;
 

-

+

+++
@@ -150,19 +128,29 @@ NMDeviceBond implements
 

-
NM_DEVICE_BOND_CARRIER

-
#define NM_DEVICE_BOND_CARRIER     "carrier"
+
NM_DEVICE_BOND_ERROR

+
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
 

 

 

 

-
NM_DEVICE_BOND_ERROR

-
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
-

+
nm_device_bond_error_quark ()

+
GQuark              nm_device_bond_error_quark          (void);

 

+Registers an error quark for NMDeviceBond if necessary.
 

+

 


 
 

 
NM_DEVICE_BOND_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBond errors.

 

 

 

@@ -174,6 +162,14 @@ NMDeviceBond implements
 

 

 

+
NM_DEVICE_BOND_CARRIER

+
#define NM_DEVICE_BOND_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_BOND_SLAVES

 
#define NM_DEVICE_BOND_SLAVES      "slaves"
 

@@ -182,38 +178,56 @@ NMDeviceBond implements
 

 

 

-
nm_device_bond_error_quark ()

-
GQuark              nm_device_bond_error_quark          (void);

+
NMDeviceBond

+
typedef struct _NMDeviceBond NMDeviceBond;

 

-Registers an error quark for NMDeviceBond if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBond errors.

 

 

 

-
nm_device_bond_get_carrier ()

-
gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);

+
NMDeviceBondClass

+
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);
+} NMDeviceBondClass;
+

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_bond_new ()

+
GObject *           nm_device_bond_new                  (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceBond.
+

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceBond
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

-TRUE if the device has carriera new device. [transfer full]
+
 

 
 

@@ -225,8 +239,11 @@ Whether the device has carrier.
 

 Gets the hardware (MAC) address of the NMDeviceBond
 

-

+

+++
@@ -243,13 +260,16 @@ device, and must not be modified.

-
nm_device_bond_get_slaves ()

-
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);

+
nm_device_bond_get_carrier ()

+
gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);

 

-Gets the devices currently slaved to device.
+Whether the device has carrier.
 

-

 


 
 

 
device :

 
 
 

+

+++
@@ -258,42 +278,40 @@ Gets the devices currently slaved to device
 
-
+

 


 
 

 
device :

 
Returns :
the GPtrArray containing
-NMDevices that are slaves of device. This is the internal
-copy used by the device, and must not be modified. [element-type NMClient.Device]
-
+TRUE if the device has carrier
 

 
 

-
Since 0.9.6.4

 

 

 

-
nm_device_bond_new ()

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

+
nm_device_bond_get_slaves ()

+
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);

 

-Creates a new NMDeviceBond.
+Gets the devices currently slaved to device.
 

-

+

+++
-
-
+
-
-
-
-
-

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBond
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
+the GPtrArray containing
+NMDevices that are slaves of device. This is the internal
+copy used by the device, and must not be modified. [element-type NMClient.Device]
 
 

 
 

+
Since 0.9.6.4

 

 

 

@@ -328,6 +346,6 @@ The devices (
 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index a1514f45..a7f2df30 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceBridge
-
+
 
 
 
 
-
+
 
 
 
@@ -43,19 +43,19 @@
 

 

 
Synopsis

-
                    NMDeviceBridge;
-                    NMDeviceBridgeClass;
-enum                NMDeviceBridgeError;
-#define             NM_DEVICE_BRIDGE_CARRIER
+
enum                NMDeviceBridgeError;
 #define             NM_DEVICE_BRIDGE_ERROR
+GQuark              nm_device_bridge_error_quark        (void);
 #define             NM_DEVICE_BRIDGE_HW_ADDRESS
+#define             NM_DEVICE_BRIDGE_CARRIER
 #define             NM_DEVICE_BRIDGE_SLAVES
-GQuark              nm_device_bridge_error_quark        (void);
-gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
-const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
-const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+                    NMDeviceBridge;
+                    NMDeviceBridgeClass;
 GObject *           nm_device_bridge_new                (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
 

 

 

@@ -89,31 +89,6 @@ NMDeviceBridge implements
 

 
Details

 

-
NMDeviceBridge

-
typedef struct _NMDeviceBridge NMDeviceBridge;

-

-

-

-

-

-
NMDeviceBridgeClass

-
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);
-} NMDeviceBridgeClass;
-

-

-

-

-

-

 
enum NMDeviceBridgeError

 
typedef enum {
 	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
@@ -122,8 +97,11 @@ NMDeviceBridge implements
 	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
 } NMDeviceBridgeError;
 

-

+

+++
@@ -151,19 +129,30 @@ NMDeviceBridge implements
 

-
NM_DEVICE_BRIDGE_CARRIER

-
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
NM_DEVICE_BRIDGE_ERROR

+
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
 

 

 

 

-
NM_DEVICE_BRIDGE_ERROR

-
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
-

+
nm_device_bridge_error_quark ()

+
GQuark              nm_device_bridge_error_quark        (void);

 

+Registers an error quark for NMDeviceBridge if necessary.
 

+

 


 
 

 
NM_DEVICE_BRIDGE_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBridge errors.

+
Since 0.9.8

 

 

 

@@ -175,6 +164,14 @@ NMDeviceBridge implements
 

 

 

+
NM_DEVICE_BRIDGE_CARRIER

+
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_BRIDGE_SLAVES

 
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 

@@ -183,39 +180,56 @@ NMDeviceBridge implements
 

 

 

-
nm_device_bridge_error_quark ()

-
GQuark              nm_device_bridge_error_quark        (void);

+
NMDeviceBridge

+
typedef struct _NMDeviceBridge NMDeviceBridge;

 

-Registers an error quark for NMDeviceBridge if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBridge errors.

-
Since 0.9.8

 

 

 

-
nm_device_bridge_get_carrier ()

-
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);

+
NMDeviceBridgeClass

+
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);
+} NMDeviceBridgeClass;
+

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_bridge_new ()

+
GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceBridge.
+

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceBridge
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

-TRUE if the device has carriera new device. [transfer full]
+
 

 
 

@@ -228,8 +242,11 @@ Whether the device has carrier.
 

 Gets the hardware (MAC) address of the NMDeviceBridge
 

-

+

+++
@@ -247,13 +264,16 @@ device, and must not be modified.

-
nm_device_bridge_get_slaves ()

-
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);

+
nm_device_bridge_get_carrier ()

+
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);

 

-Gets the devices currently slaved to device.
+Whether the device has carrier.
 

-

 


 
 

 
device :

 
 
 

+

+++
@@ -262,10 +282,8 @@ Gets the devices currently slaved to device
 
-
+

 


 
 

 
device :

 
Returns :
the GPtrArray containing
-NMDevices that are slaves of device. This is the internal
-copy used by the device, and must not be modified. [element-type NMClient.Device]
-
+TRUE if the device has carrier
 

 
 

@@ -273,27 +291,27 @@ copy used by the device, and must not be modified. [
 

 

-
nm_device_bridge_new ()

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

+
nm_device_bridge_get_slaves ()

+
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);

 

-Creates a new NMDeviceBridge.
+Gets the devices currently slaved to device.
 

-

+

+++
-
-
+
-
-
-
-
-
@@ -335,6 +353,6 @@ The devices (
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index bc766453..e3a59fc7 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceBt
-
+
 
 
 
 
-
+
 
 
 
@@ -43,19 +43,19 @@
 

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBridge
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
+the GPtrArray containing
+NMDevices that are slaves of device. This is the internal
+copy used by the device, and must not be modified. [element-type NMClient.Device]
 
 

 

 

 
Synopsis

-
                    NMDeviceBt;
-                    NMDeviceBtClass;
-enum                NMDeviceBtError;
-#define             NM_DEVICE_BT_CAPABILITIES
+
enum                NMDeviceBtError;
 #define             NM_DEVICE_BT_ERROR
+GQuark              nm_device_bt_error_quark            (void);
 #define             NM_DEVICE_BT_HW_ADDRESS
 #define             NM_DEVICE_BT_NAME
-GQuark              nm_device_bt_error_quark            (void);
-NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);
-const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);
-const char *        nm_device_bt_get_name               (NMDeviceBt *device);
+#define             NM_DEVICE_BT_CAPABILITIES
+                    NMDeviceBt;
+                    NMDeviceBtClass;
 GObject *           nm_device_bt_new                    (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);
+const char *        nm_device_bt_get_name               (NMDeviceBt *device);
+NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);
 

 

 

@@ -89,31 +89,6 @@ NMDeviceBt implements
 

 
Details

 

-
NMDeviceBt

-
typedef struct _NMDeviceBt NMDeviceBt;

-

-

-

-

-

-
NMDeviceBtClass

-
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);
-} NMDeviceBtClass;
-

-

-

-

-

-

 
enum NMDeviceBtError

 
typedef enum {
 	NM_DEVICE_BT_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
@@ -124,8 +99,11 @@ NMDeviceBt implements
 	NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS,   /*< nick=MissingDeviceCaps >*/
 } NMDeviceBtError;
 

-

+

+++
@@ -162,19 +140,29 @@ NMDeviceBt implements
 

-
NM_DEVICE_BT_CAPABILITIES

-
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
+
NM_DEVICE_BT_ERROR

+
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
 

 

 

 

-
NM_DEVICE_BT_ERROR

-
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
-

+
nm_device_bt_error_quark ()

+
GQuark              nm_device_bt_error_quark            (void);

 

+Registers an error quark for NMDeviceBt if necessary.
 

+

 


 
 

 
NM_DEVICE_BT_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBt errors.

 

 

 

@@ -194,37 +182,63 @@ NMDeviceBt implements
 

 

 

-
nm_device_bt_error_quark ()

-
GQuark              nm_device_bt_error_quark            (void);

+
NM_DEVICE_BT_CAPABILITIES

+
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
+

 

-Registers an error quark for NMDeviceBt if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBt errors.

 

 

 

-
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

+
NMDeviceBt

+
typedef struct _NMDeviceBt NMDeviceBt;

 

-Returns the Bluetooth device's usable capabilities.
 

-

+
+

+

+
NMDeviceBtClass

+
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);
+} NMDeviceBtClass;
+

+

+

+

+

+

+
nm_device_bt_new ()

+
GObject *           nm_device_bt_new                    (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceBt.
+

+

+++
-
-
+
+
+
+
+
-
@@ -237,8 +251,11 @@ Returns the Bluetooth device's usable capabilities.
 

 Gets the hardware (MAC) address of the NMDeviceBt
 

-

 


 
 
device :
a NMDeviceBt
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :
a combination of NMBluetoothCapabilities
+a new device. [transfer full]
 
 

 

+

+++
@@ -260,8 +277,11 @@ device, and must not be modified.

 Gets the name of the NMDeviceBt.
 

-

 


 
 

 
device :

 

+

+++
@@ -277,27 +297,25 @@ Gets the name of the <
 
 

 

-
nm_device_bt_new ()

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

+
nm_device_bt_get_capabilities ()

+
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

 

-Creates a new NMDeviceBt.
+Returns the Bluetooth device's usable capabilities.
 

-

 


 
 

 
device :

+

+++
-
-
+
-
-
-
-
-
@@ -336,6 +354,6 @@ The name of the bluetooth device.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 94d959b6..4dec91a2 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -3,12 +3,12 @@
 NMDeviceEthernet
-
+
-
+
@@ -43,22 +43,22 @@
 

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBt
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
+a combination of NMBluetoothCapabilities
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMDeviceEthernet;
-                    NMDeviceEthernetClass;
-enum                NMDeviceEthernetError;
-#define             NM_DEVICE_ETHERNET_CARRIER
+
enum                NMDeviceEthernetError;
 #define             NM_DEVICE_ETHERNET_ERROR
+GQuark              nm_device_ethernet_error_quark      (void);
 #define             NM_DEVICE_ETHERNET_HW_ADDRESS
 #define             NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 #define             NM_DEVICE_ETHERNET_SPEED
-GQuark              nm_device_ethernet_error_quark      (void);
-gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
+#define             NM_DEVICE_ETHERNET_CARRIER
+                    NMDeviceEthernet;
+                    NMDeviceEthernetClass;
+GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
+                                                         const char *path);
 const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);
 const char *        nm_device_ethernet_get_permanent_hw_address
                                                         (NMDeviceEthernet *device);
 guint32             nm_device_ethernet_get_speed        (NMDeviceEthernet *device);
-GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
-                                                         const char *path);
+gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
 

 

 

@@ -93,31 +93,6 @@ NMDeviceEthernet implements
 

 
Details

 

-
NMDeviceEthernet

-
typedef struct _NMDeviceEthernet NMDeviceEthernet;

-

-

-

-

-

-
NMDeviceEthernetClass

-
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);
-} NMDeviceEthernetClass;
-

-

-

-

-

-

 
enum NMDeviceEthernetError

 
typedef enum {
 	NM_DEVICE_ETHERNET_ERROR_UNKNOWN = 0,                 /*< nick=UnknownError >*/
@@ -127,8 +102,11 @@ NMDeviceEthernet implements
 	NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH,                /*< nick=MacMismatch >*/
 } NMDeviceEthernetError;
 

-

+

+++
@@ -160,19 +138,29 @@ NMDeviceEthernet implements
 

-
NM_DEVICE_ETHERNET_CARRIER

-
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+
NM_DEVICE_ETHERNET_ERROR

+
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
 

 

 

 

-
NM_DEVICE_ETHERNET_ERROR

-
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
-

+
nm_device_ethernet_error_quark ()

+
GQuark              nm_device_ethernet_error_quark      (void);

 

+Registers an error quark for NMDeviceEthernet if necessary.
 

+

 


 
 

 
NM_DEVICE_ETHERNET_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceEthernet errors.

 

 

 

@@ -200,38 +188,64 @@ NMDeviceEthernet implements
 

 

 

-
nm_device_ethernet_error_quark ()

-
GQuark              nm_device_ethernet_error_quark      (void);

+
NM_DEVICE_ETHERNET_CARRIER

+
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+

 

-Registers an error quark for NMDeviceEthernet if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceEthernet errors.

 

 

 

-
nm_device_ethernet_get_carrier ()

-
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

+
NMDeviceEthernet

+
typedef struct _NMDeviceEthernet NMDeviceEthernet;

 

-Whether the device has carrier.
 

-

+
+

+

+
NMDeviceEthernetClass

+
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);
+} NMDeviceEthernetClass;
+

+

+

+

+

+

+
nm_device_ethernet_new ()

+
GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceEthernet.
+

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceEthernet
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

-TRUE if the device has carriera new device. [transfer full]
+
 

 
 

@@ -243,8 +257,11 @@ Whether the device has carrier.
 

 Gets the active hardware (MAC) address of the NMDeviceEthernet
 

-

+

+++
@@ -267,8 +284,11 @@ device, and must not be modified.

 Gets the permanent hardware (MAC) address of the NMDeviceEthernet
 

-

 


 
 

 
device :

 

+

+++
@@ -290,8 +310,11 @@ device, and must not be modified.

 Gets the speed of the NMDeviceEthernet.
 

-

 


 
 

 
device :

 

+

+++
@@ -307,28 +330,26 @@ Gets the speed of the 
-
nm_device_ethernet_new ()

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

+
nm_device_ethernet_get_carrier ()

+
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

-Creates a new NMDeviceEthernet.
+Whether the device has carrier.
 

-

 


 
 

 
device :

 

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceEthernet
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
-
+TRUE if the device has carrier
 

 
 

@@ -375,6 +396,6 @@ The speed of the device.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 4b0b5791..89b30130 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceInfiniband
-
+
 
 
 
 
-
+
 
 
 
@@ -43,17 +43,17 @@
 

 

 
Synopsis

-
                    NMDeviceInfiniband;
-                    NMDeviceInfinibandClass;
-enum                NMDeviceInfinibandError;
-#define             NM_DEVICE_INFINIBAND_CARRIER
+
enum                NMDeviceInfinibandError;
 #define             NM_DEVICE_INFINIBAND_ERROR
-#define             NM_DEVICE_INFINIBAND_HW_ADDRESS
 GQuark              nm_device_infiniband_error_quark    (void);
-gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);
-const char *        nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);
+#define             NM_DEVICE_INFINIBAND_HW_ADDRESS
+#define             NM_DEVICE_INFINIBAND_CARRIER
+                    NMDeviceInfiniband;
+                    NMDeviceInfinibandClass;
 GObject *           nm_device_infiniband_new            (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);
+gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);
 

 

 

@@ -86,31 +86,6 @@ NMDeviceInfiniband implements
 

 
Details

 

-
NMDeviceInfiniband

-
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;

-

-

-

-

-

-
NMDeviceInfinibandClass

-
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);
-} NMDeviceInfinibandClass;
-

-

-

-

-

-

 
enum NMDeviceInfinibandError

 
typedef enum {
 	NM_DEVICE_INFINIBAND_ERROR_UNKNOWN = 0,                   /*< nick=UnknownError >*/
@@ -120,8 +95,11 @@ NMDeviceInfiniband implements
 	NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH,                  /*< nick=MacMismatch >*/
 } NMDeviceInfinibandError;
 

-

+

+++
@@ -153,19 +131,29 @@ NMDeviceInfiniband implements
 

-
NM_DEVICE_INFINIBAND_CARRIER

-
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
+
NM_DEVICE_INFINIBAND_ERROR

+
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
 

 

 

 

-
NM_DEVICE_INFINIBAND_ERROR

-
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
-

+
nm_device_infiniband_error_quark ()

+
GQuark              nm_device_infiniband_error_quark    (void);

 

+Registers an error quark for NMDeviceInfiniband if necessary.
 

+

 


 
 

 
NM_DEVICE_INFINIBAND_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceInfiniband errors.

 

 

 

@@ -177,38 +165,64 @@ NMDeviceInfiniband implements
 

 

 

-
nm_device_infiniband_error_quark ()

-
GQuark              nm_device_infiniband_error_quark    (void);

+
NM_DEVICE_INFINIBAND_CARRIER

+
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
+

 

-Registers an error quark for NMDeviceInfiniband if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceInfiniband errors.

 

 

 

-
nm_device_infiniband_get_carrier ()

-
gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);

+
NMDeviceInfiniband

+
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;

 

-Whether the device has carrier.
 

-

+
+

+

+
NMDeviceInfinibandClass

+
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);
+} NMDeviceInfinibandClass;
+

+

+

+

+

+

+
nm_device_infiniband_new ()

+
GObject *           nm_device_infiniband_new            (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceInfiniband.
+

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceInfiniband
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

-TRUE if the device has carriera new device. [transfer full]
+
 

 
 

@@ -220,8 +234,11 @@ Whether the device has carrier.
 

 Gets the hardware (MAC) address of the NMDeviceInfiniband
 

-

+

+++
@@ -238,28 +255,26 @@ device, and must not be modified.

-
nm_device_infiniband_new ()

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

+
nm_device_infiniband_get_carrier ()

+
gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);

 

-Creates a new NMDeviceInfiniband.
+Whether the device has carrier.
 

-

 


 
 

 
device :

 
 
 

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceInfiniband
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
-
+TRUE if the device has carrier
 

 
 

@@ -288,6 +303,6 @@ The hardware (MAC) address of the device.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 6dec6b03..d5fb1cdf 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceModem
-
+
 
 
 
 
-
+
 
 
 
@@ -43,17 +43,17 @@
 

 

 
Synopsis

-
                    NMDeviceModem;
-                    NMDeviceModemClass;
-enum                NMDeviceModemError;
-#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+
enum                NMDeviceModemError;
 #define             NM_DEVICE_MODEM_ERROR
-#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
 GQuark              nm_device_modem_error_quark         (void);
-NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
-                                                        (NMDeviceModem *self);
+#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);
 

 

 

@@ -86,31 +86,6 @@ NMDeviceModem implements
 

 
Details

 

-
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;
-

-

-

-

-

-

 
enum NMDeviceModemError

 
typedef enum {
 	NM_DEVICE_MODEM_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
@@ -119,8 +94,11 @@ NMDeviceModem implements
 	NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS,      /*< nick=MissingDeviceCaps >*/
 } NMDeviceModemError;
 

-

+

+++
@@ -147,19 +125,29 @@ NMDeviceModem implements
 

-
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

-
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+
NM_DEVICE_MODEM_ERROR

+
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
 

 

 

 

-
NM_DEVICE_MODEM_ERROR

-
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
-

+
nm_device_modem_error_quark ()

+
GQuark              nm_device_modem_error_quark         (void);

 

+Registers an error quark for NMDeviceModem if necessary.
 

+

 


 
 

 
NM_DEVICE_MODEM_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceModem errors.

 

 

 

@@ -171,31 +159,52 @@ NMDeviceModem implements
 

 

 

-
nm_device_modem_error_quark ()

-
GQuark              nm_device_modem_error_quark         (void);

+
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

+
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+

 

-Registers an error quark for NMDeviceModem if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceModem errors.

 

 

 

-
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_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 without a firmware reload or reinitialization.  This value
-represents the network types the modem can immediately connect to.
+supports.  Not all capabilities are available concurrently however; some
+may require a firmware reload or reinitialization.
 

-

+

+++
@@ -204,24 +213,26 @@ represents the network types the modem can immediately connect to.
 
-
+

 


 
 

 
self :

 

 
Returns :
the generic access technology families the modem supports without
-a firmware reload or other reinitializationthe generic access technology families the modem supports
 

 
 

 

 

 

-
nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
+
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.  Not all capabilities are available concurrently however; some
-may require a firmware reload or reinitialization.
+supports without a firmware reload or reinitialization.  This value
+represents the network types the modem can immediately connect to.
 

-

+

+++
@@ -230,7 +241,8 @@ may require a firmware reload or reinitialization.
 
-
+

 


 
 

 
self :

 

 
Returns :
the generic access technology families the modem supportsthe generic access technology families the modem supports without
+a firmware reload or other reinitialization
 

 
 

@@ -263,6 +275,6 @@ CDMA/EVDO and GSM/UMTS.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index 2af9c04b..ca10adb6 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceOlpcMesh
-
+
 
 
 
 
-
+
 
 
 
@@ -43,20 +43,20 @@
 

 

 
Synopsis

-
                    NMDeviceOlpcMesh;
-                    NMDeviceOlpcMeshClass;
-enum                NMDeviceOlpcMeshError;
-#define             NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-#define             NM_DEVICE_OLPC_MESH_COMPANION
+
enum                NMDeviceOlpcMeshError;
 #define             NM_DEVICE_OLPC_MESH_ERROR
-#define             NM_DEVICE_OLPC_MESH_HW_ADDRESS
 GQuark              nm_device_olpc_mesh_error_quark     (void);
-guint32             nm_device_olpc_mesh_get_active_channel
-                                                        (NMDeviceOlpcMesh *device);
-NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);
-const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);
+#define             NM_DEVICE_OLPC_MESH_HW_ADDRESS
+#define             NM_DEVICE_OLPC_MESH_COMPANION
+#define             NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+                    NMDeviceOlpcMesh;
+                    NMDeviceOlpcMeshClass;
 GObject *           nm_device_olpc_mesh_new             (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);
+NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);
+guint32             nm_device_olpc_mesh_get_active_channel
+                                                        (NMDeviceOlpcMesh *device);
 

 

 

@@ -90,31 +90,6 @@ NMDeviceOlpcMesh implements
 

 
Details

 

-
NMDeviceOlpcMesh

-
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;

-

-

-

-

-

-
NMDeviceOlpcMeshClass

-
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);
-} NMDeviceOlpcMeshClass;
-

-

-

-

-

-

 
enum NMDeviceOlpcMeshError

 
typedef enum {
 	NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
@@ -122,8 +97,11 @@ NMDeviceOlpcMesh implements
 	NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION, /*< nick=InvalidOlpcMeshConnection >*/
 } NMDeviceOlpcMeshError;
 

-

+

+++
@@ -145,8 +123,34 @@ NMDeviceOlpcMesh implements
 

-
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

-
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
+
NM_DEVICE_OLPC_MESH_ERROR

+
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+

+

+

+

+

+

+
nm_device_olpc_mesh_error_quark ()

+
GQuark              nm_device_olpc_mesh_error_quark     (void);

+

+Registers an error quark for NMDeviceOlpcMesh if necessary.
+

+

 


 
 

 
NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceOlpcMesh errors.

+

+

+

+
NM_DEVICE_OLPC_MESH_HW_ADDRESS

+
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 

 

 

@@ -161,67 +165,80 @@ NMDeviceOlpcMesh implements
 

 

 

-
NM_DEVICE_OLPC_MESH_ERROR

-
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

+
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 

 

 

 

 

 

-
NM_DEVICE_OLPC_MESH_HW_ADDRESS

-
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
-

+
NMDeviceOlpcMesh

+
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;

 

 

 

 

 

-
nm_device_olpc_mesh_error_quark ()

-
GQuark              nm_device_olpc_mesh_error_quark     (void);

+
NMDeviceOlpcMeshClass

+
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);
+} NMDeviceOlpcMeshClass;
+

 

-Registers an error quark for NMDeviceOlpcMesh if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceOlpcMesh errors.

 

 

 

-
nm_device_olpc_mesh_get_active_channel ()

-
guint32             nm_device_olpc_mesh_get_active_channel
-                                                        (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_new ()

+
GObject *           nm_device_olpc_mesh_new             (DBusGConnection *connection,
+                                                         const char *path);

 

-Returns the active channel of the NMDeviceOlpcMesh device.
+Creates a new NMDeviceOlpcMesh.
 

-

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceOlpcMesh
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :
active channel of the devicea new OlpcMesh device. [transfer full]
+
 

 
 

 

 

 

-
nm_device_olpc_mesh_get_companion ()

-
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_get_hw_address ()

+
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);

 

-Gets the companion device of the NMDeviceOlpcMesh.
+Gets the hardware (MAC) address of the NMDeviceOlpcMesh
 

-

+

+++
@@ -230,21 +247,24 @@ Gets the companion device of the 
 
-
+

 


 
 

 
device :

 
Returns :
the companion of the device of NULL. [transfer none]
-the hardware address. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_olpc_mesh_get_hw_address ()

-
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_get_companion ()

+
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);

 

-Gets the hardware (MAC) address of the NMDeviceOlpcMesh
+Gets the companion device of the NMDeviceOlpcMesh.
 

-

+

+++
@@ -253,36 +273,34 @@ Gets the hardware (MAC) address of the Returns :

-
+

 


 
 

 
device :
the hardware address. This is the internal string used by the
-device, and must not be modified.the companion of the device of NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_device_olpc_mesh_new ()

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

+
nm_device_olpc_mesh_get_active_channel ()

+
guint32             nm_device_olpc_mesh_get_active_channel
+                                                        (NMDeviceOlpcMesh *device);

 

-Creates a new NMDeviceOlpcMesh.
+Returns the active channel of the NMDeviceOlpcMesh device.
 

-

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceOlpcMesh
 
 

 
path :
the DBus object path of the device

 
Returns :
a new OlpcMesh device. [transfer full]
-active channel of the device
 

 
 

@@ -319,6 +337,6 @@ The hardware (MAC) address of the device.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index 4e7f1a70..7ca398c1 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceVlan
-
+
 
 
 
 
-
+
 
 
 
@@ -43,19 +43,19 @@
 

 

 
Synopsis

-
                    NMDeviceVlan;
-                    NMDeviceVlanClass;
-enum                NMDeviceVlanError;
-#define             NM_DEVICE_VLAN_CARRIER
+
enum                NMDeviceVlanError;
 #define             NM_DEVICE_VLAN_ERROR
+GQuark              nm_device_vlan_error_quark          (void);
 #define             NM_DEVICE_VLAN_HW_ADDRESS
+#define             NM_DEVICE_VLAN_CARRIER
 #define             NM_DEVICE_VLAN_VLAN_ID
-GQuark              nm_device_vlan_error_quark          (void);
-gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);
-const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);
-guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);
+                    NMDeviceVlan;
+                    NMDeviceVlanClass;
 GObject *           nm_device_vlan_new                  (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);
+gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);
+guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);
 

 

 

@@ -89,31 +89,6 @@ NMDeviceVlan implements
 

 
Details

 

-
NMDeviceVlan

-
typedef struct _NMDeviceVlan NMDeviceVlan;

-

-

-

-

-

-
NMDeviceVlanClass

-
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);
-} NMDeviceVlanClass;
-

-

-

-

-

-

 
enum NMDeviceVlanError

 
typedef enum {
 	NM_DEVICE_VLAN_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
@@ -123,8 +98,11 @@ NMDeviceVlan implements
 	NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
 } NMDeviceVlanError;
 

-

+

+++
@@ -156,19 +134,29 @@ NMDeviceVlan implements
 

-
NM_DEVICE_VLAN_CARRIER

-
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+
NM_DEVICE_VLAN_ERROR

+
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
 

 

 

 

-
NM_DEVICE_VLAN_ERROR

-
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
-

+
nm_device_vlan_error_quark ()

+
GQuark              nm_device_vlan_error_quark          (void);

 

+Registers an error quark for NMDeviceVlan if necessary.
 

+

 


 
 

 
NM_DEVICE_VLAN_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceVlan errors.

 

 

 

@@ -180,6 +168,14 @@ NMDeviceVlan implements
 

 

 

+
NM_DEVICE_VLAN_CARRIER

+
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_VLAN_VLAN_ID

 
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 

@@ -188,38 +184,56 @@ NMDeviceVlan implements
 

 

 

-
nm_device_vlan_error_quark ()

-
GQuark              nm_device_vlan_error_quark          (void);

+
NMDeviceVlan

+
typedef struct _NMDeviceVlan NMDeviceVlan;

 

-Registers an error quark for NMDeviceVlan if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceVlan errors.

 

 

 

-
nm_device_vlan_get_carrier ()

-
gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);

+
NMDeviceVlanClass

+
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);
+} NMDeviceVlanClass;
+

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_vlan_new ()

+
GObject *           nm_device_vlan_new                  (DBusGConnection *connection,
+                                                         const char *path);

+

+Creates a new NMDeviceVlan.
+

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
device :
a NMDeviceVlan
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

-TRUE if the device has carriera new device. [transfer full]
+
 

 
 

@@ -231,8 +245,11 @@ Whether the device has carrier.
 

 Gets the hardware (MAC) address of the NMDeviceVlan
 

-

+

+++
@@ -249,10 +266,16 @@ device, and must not be modified.

-
nm_device_vlan_get_vlan_id ()

-
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

-

 


 
 

 
device :

 
 
 

+
nm_device_vlan_get_carrier ()

+
gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);

+

+Whether the device has carrier.
+

+

+++
@@ -261,35 +284,30 @@ device, and must not be modified.
-
+

 


 
 

 
device :

 

 

 
Returns :
the device's VLAN ID
+TRUE if the device has carrier
 

 
 

 

 

 

-
nm_device_vlan_new ()

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

-

-Creates a new NMDeviceVlan.
-

-

+
nm_device_vlan_get_vlan_id ()

+
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceVlan
 
 

 
path :
the DBus object path of the device

 
Returns :
a new device. [transfer full]
-the device's VLAN ID
 

 
 

@@ -328,6 +346,6 @@ The device's VLAN ID.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 963d2ca4..1fcd9f27 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceWifi
-
+
 
 
 
 
-
+
 
 
 
@@ -45,35 +45,35 @@
 

 

 
Synopsis

-
                    NMDeviceWifi;
-                    NMDeviceWifiClass;
-enum                NMDeviceWifiError;
-void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
-                                                         GError *error,
-                                                         gpointer user_data);
-#define             NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
-#define             NM_DEVICE_WIFI_BITRATE
-#define             NM_DEVICE_WIFI_CAPABILITIES
+
enum                NMDeviceWifiError;
 #define             NM_DEVICE_WIFI_ERROR
+GQuark              nm_device_wifi_error_quark          (void);
 #define             NM_DEVICE_WIFI_HW_ADDRESS
-#define             NM_DEVICE_WIFI_MODE
 #define             NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-GQuark              nm_device_wifi_error_quark          (void);
-NMAccessPoint *     nm_device_wifi_get_access_point_by_path
-                                                        (NMDeviceWifi *device,
+#define             NM_DEVICE_WIFI_MODE
+#define             NM_DEVICE_WIFI_BITRATE
+#define             NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
+#define             NM_DEVICE_WIFI_CAPABILITIES
+                    NMDeviceWifi;
+                    NMDeviceWifiClass;
+GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
                                                          const char *path);
-const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
-NMAccessPoint *     nm_device_wifi_get_active_access_point
+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);
 NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
                                                         (NMDeviceWifi *device);
-const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);
-NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
-const char *        nm_device_wifi_get_permanent_hw_address
+NMAccessPoint *     nm_device_wifi_get_active_access_point
                                                         (NMDeviceWifi *device);
-GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
+NMAccessPoint *     nm_device_wifi_get_access_point_by_path
+                                                        (NMDeviceWifi *device,
                                                          const char *path);
+const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
+void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
+                                                         GError *error,
+                                                         gpointer user_data);
 void                nm_device_wifi_request_scan_simple  (NMDeviceWifi *device,
                                                          NMDeviceWifiRequestScanFn callback,
                                                          gpointer user_data);
@@ -120,35 +120,6 @@ NMDeviceWifi implements
 

 
Details

 

-
NMDeviceWifi

-
typedef struct _NMDeviceWifi NMDeviceWifi;

-

-

-

-

-

-
NMDeviceWifiClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*access_point_added) (NMDeviceWifi *device, NMAccessPoint *ap);
-	void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceWifiClass;
-

-

-

-

-

-

 
enum NMDeviceWifiError

 
typedef enum {
 	NM_DEVICE_WIFI_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
@@ -160,8 +131,11 @@ NMDeviceWifi implements
 	NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS, /*< nick=MissingDeviceRsnCaps >*/
 } NMDeviceWifiError;
 

-

+

+++
@@ -205,108 +179,133 @@ required by the connection
 

-
NMDeviceWifiRequestScanFn ()

-
void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NM_DEVICE_WIFI_ERROR

+
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+

 

 

 

-
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

-
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
-

+
nm_device_wifi_error_quark ()

+
GQuark              nm_device_wifi_error_quark          (void);

 

+Registers an error quark for NMDeviceWifi if necessary.
 

+

 


 
 

 
NM_DEVICE_WIFI_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceWifi errors.

 

 

 

-
NM_DEVICE_WIFI_BITRATE

-
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
+
NM_DEVICE_WIFI_HW_ADDRESS

+
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_CAPABILITIES

-
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
+
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

+
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_ERROR

-
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+
NM_DEVICE_WIFI_MODE

+
#define NM_DEVICE_WIFI_MODE                "mode"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_HW_ADDRESS

-
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
+
NM_DEVICE_WIFI_BITRATE

+
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_MODE

-
#define NM_DEVICE_WIFI_MODE                "mode"
+
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

+
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

-
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
+
NM_DEVICE_WIFI_CAPABILITIES

+
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 

 

 

 

 

 

-
nm_device_wifi_error_quark ()

-
GQuark              nm_device_wifi_error_quark          (void);

+
NMDeviceWifi

+
typedef struct _NMDeviceWifi NMDeviceWifi;

 

-Registers an error quark for NMDeviceWifi if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceWifi errors.

 

 

 

-
nm_device_wifi_get_access_point_by_path ()

-
NMAccessPoint *     nm_device_wifi_get_access_point_by_path
-                                                        (NMDeviceWifi *device,
+
NMDeviceWifiClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Signals */
+	void (*access_point_added) (NMDeviceWifi *device, NMAccessPoint *ap);
+	void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceWifiClass;
+

+

+

+

+

+

+
nm_device_wifi_new ()

+
GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
                                                          const char *path);

 

-Gets a NMAccessPoint by path.
+Creates a new NMDeviceWifi.
 

-

+

+++
-
-
+
-
+
-
@@ -314,13 +313,16 @@ Gets a 
 

 

-
nm_device_wifi_get_access_points ()

-
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

+
nm_device_wifi_get_hw_address ()

+
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

 

-Gets all the scanned access points of the NMDeviceWifi.
+Gets the actual hardware (MAC) address of the NMDeviceWifi
 

-

 


 
 
device :
a NMDeviceWifi
+
connection :
the DBusGConnection
 
 

 

 
path :
the object path of the access pointthe DBus object path of the device
 

 

 
Returns :
the access point or NULL if none is found. [transfer none]
+a new WiFi device. [transfer full]
 
 

 

+

+++
@@ -329,24 +331,25 @@ Gets all the scanned access points of the Returns :

-
+

 


 
 

 
device :
a GPtrArray containing all the
-scanned NMAccessPoints.
-The returned array is owned by the client and should not be modified. [element-type NMClient.AccessPoint]
-the actual hardware address. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_wifi_get_active_access_point ()

-
NMAccessPoint *     nm_device_wifi_get_active_access_point
+
nm_device_wifi_get_permanent_hw_address ()

+
const char *        nm_device_wifi_get_permanent_hw_address
                                                         (NMDeviceWifi *device);

 

-Gets the active NMAccessPoint.
+Gets the permanent hardware (MAC) address of the NMDeviceWifi
 

-

+

+++
@@ -355,21 +358,24 @@ Gets the active 
 
-
+

 


 
 

 
device :

 

 
Returns :
the access point or NULL if none is active. [transfer none]
-the permanent hardware address. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_wifi_get_bitrate ()

-
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

+
nm_device_wifi_get_mode ()

+
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

 

-Gets the bit rate of the NMDeviceWifi.
+Gets the NMDeviceWifi mode.
 

-

+

+++
@@ -378,21 +384,23 @@ Gets the bit rate of the Returns :

-
+

 


 
 

 
device :
the bit ratethe mode
 

 
 

 

 

 

-
nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
-                                                        (NMDeviceWifi *device);

+
nm_device_wifi_get_bitrate ()

+
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

 

-Gets the WIFI capabilities of the NMDeviceWifi.
+Gets the bit rate of the NMDeviceWifi.
 

-

+

+++
@@ -401,20 +409,24 @@ Gets the WIFI capabilities of the 
 
-
+

 


 
 

 
device :

 
Returns :
the capabilitiesthe bit rate
 

 
 

 

 

 

-
nm_device_wifi_get_hw_address ()

-
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

+
nm_device_wifi_get_capabilities ()

+
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
+                                                        (NMDeviceWifi *device);

 

-Gets the actual hardware (MAC) address of the NMDeviceWifi
+Gets the WIFI capabilities of the NMDeviceWifi.
 

-

+

+++
@@ -423,21 +435,24 @@ Gets the actual hardware (MAC) address of the Returns :

-
+

 


 
 

 
device :
the actual hardware address. This is the internal string used by the
-device, and must not be modified.the capabilities
 

 
 

 

 

 

-
nm_device_wifi_get_mode ()

-
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

+
nm_device_wifi_get_active_access_point ()

+
NMAccessPoint *     nm_device_wifi_get_active_access_point
+                                                        (NMDeviceWifi *device);

 

-Gets the NMDeviceWifi mode.
+Gets the active NMAccessPoint.
 

-

+

+++
@@ -446,21 +461,26 @@ Gets the 
 
-
+

 


 
 

 
device :

 
Returns :
the modethe access point or NULL if none is active. [transfer none]
+
 

 
 

 

 

 

-
nm_device_wifi_get_permanent_hw_address ()

-
const char *        nm_device_wifi_get_permanent_hw_address
-                                                        (NMDeviceWifi *device);

+
nm_device_wifi_get_access_point_by_path ()

+
NMAccessPoint *     nm_device_wifi_get_access_point_by_path
+                                                        (NMDeviceWifi *device,
+                                                         const char *path);

 

-Gets the permanent hardware (MAC) address of the NMDeviceWifi
+Gets a NMAccessPoint by path.
 

-

+

+++
@@ -468,36 +488,40 @@ Gets the permanent hardware (MAC) address of the path :

+
+
+
-
+

 


 
 

 
device :
the object path of the access point

 
Returns :
the permanent hardware address. This is the internal string used by the
-device, and must not be modified.the access point or NULL if none is found. [transfer none]
+
 

 
 

 

 

 

-
nm_device_wifi_new ()

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

+
nm_device_wifi_get_access_points ()

+
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

 

-Creates a new NMDeviceWifi.
+Gets all the scanned access points of the NMDeviceWifi.
 

-

+

+++
-
-
+
-
-
-
-
-
@@ -505,6 +529,15 @@ Creates a new 
 

 

+
NMDeviceWifiRequestScanFn ()

+
void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
+                                                         GError *error,
+                                                         gpointer user_data);

+

+

+

+

+

 
nm_device_wifi_request_scan_simple ()

 
void                nm_device_wifi_request_scan_simple  (NMDeviceWifi *device,
                                                          NMDeviceWifiRequestScanFn callback,
@@ -514,8 +547,11 @@ Request NM to scan for access points on the nm_device_wifi_get_access_points()
 to get available access points.
 

-

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceWifi
 
 

 
path :
the DBus object path of the device

 
Returns :
a new WiFi device. [transfer full]
+a GPtrArray containing all the
+scanned NMAccessPoints.
+The returned array is owned by the client and should not be modified. [element-type NMClient.AccessPoint]
 
 

 

+

+++
@@ -603,8 +639,11 @@ The wireless capabilities of the device.
 

 Notifies that a NMAccessPoint is added to the wifi device.
 

-

 


 
 

 
device :

+

+++
@@ -630,8 +669,11 @@ Notifies that a 
 

 Notifies that a NMAccessPoint is removed from the wifi device.
 

-

 


 
 

 
device :

+

+++
@@ -652,6 +694,6 @@ Notifies that a 
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index e36f9d08..5cd1c4de 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -3,12 +3,12 @@
 
 
 NMDeviceWimax
-
+
 
 
 
 
-
+
 
 
 
@@ -45,31 +45,31 @@
 

 


 
 

 
device :

 

 
Synopsis

-
                    NMDeviceWimax;
-                    NMDeviceWimaxClass;
-enum                NMDeviceWimaxError;
-#define             NM_DEVICE_WIMAX_ACTIVE_NSP
-#define             NM_DEVICE_WIMAX_BSID
-#define             NM_DEVICE_WIMAX_CENTER_FREQUENCY
-#define             NM_DEVICE_WIMAX_CINR
+
enum                NMDeviceWimaxError;
 #define             NM_DEVICE_WIMAX_ERROR
+GQuark              nm_device_wimax_error_quark         (void);
 #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
-GQuark              nm_device_wimax_error_quark         (void);
-NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
-const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
-guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);
-gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
+#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);
-GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
-                                                         const char *path);
+const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
 

 

 

@@ -114,27 +114,6 @@ NMDeviceWimax implements
 

 
Details

 

-
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;
-

-

-

-

-

-

 
enum NMDeviceWimaxError

 
typedef enum {
 	NM_DEVICE_WIMAX_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
@@ -144,8 +123,11 @@ NMDeviceWimax implements
 	NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH,             /*< nick=MacMismatch >*/
 } NMDeviceWimaxError;
 

-

+

+++
@@ -177,56 +159,66 @@ NMDeviceWimax implements
 

-
NM_DEVICE_WIMAX_ACTIVE_NSP

-
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+
NM_DEVICE_WIMAX_ERROR

+
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
 

 

 

 

-
NM_DEVICE_WIMAX_BSID

-
#define NM_DEVICE_WIMAX_BSID             "bsid"
-

+
nm_device_wimax_error_quark ()

+
GQuark              nm_device_wimax_error_quark         (void);

 

+Registers an error quark for NMDeviceWimax if necessary.
 

+

 


 
 

 
NM_DEVICE_WIMAX_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceWimax errors.

 

 

 

-
NM_DEVICE_WIMAX_CENTER_FREQUENCY

-
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+
NM_DEVICE_WIMAX_HW_ADDRESS

+
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_CINR

-
#define NM_DEVICE_WIMAX_CINR             "cinr"
+
NM_DEVICE_WIMAX_ACTIVE_NSP

+
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_ERROR

-
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
+
NM_DEVICE_WIMAX_CENTER_FREQUENCY

+
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_HW_ADDRESS

-
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
+
NM_DEVICE_WIMAX_RSSI

+
#define NM_DEVICE_WIMAX_RSSI             "rssi"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_RSSI

-
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+
NM_DEVICE_WIMAX_CINR

+
#define NM_DEVICE_WIMAX_CINR             "cinr"
 

 

 

@@ -241,122 +233,102 @@ NMDeviceWimax implements
 

 

 

-
nm_device_wimax_error_quark ()

-
GQuark              nm_device_wimax_error_quark         (void);

+
NM_DEVICE_WIMAX_BSID

+
#define NM_DEVICE_WIMAX_BSID             "bsid"
+

 

-Registers an error quark for NMDeviceWimax if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceWimax errors.

 

 

 

-
nm_device_wimax_get_active_nsp ()

-
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

+
NMDeviceWimax

+
typedef struct _NMDeviceWimax NMDeviceWimax;

 

-Gets the active NMWimaxNsp.
 

-

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


wimax :
a NMDeviceWimax
-
Returns :
the access point or NULL if none is active. [transfer full]
-

 

 

 

-
nm_device_wimax_get_bsid ()

-
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

+
NMDeviceWimaxClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Signals */
+	void (*nsp_added)   (NMDeviceWimax *self, NMWimaxNsp *nsp);
+	void (*nsp_removed) (NMDeviceWimax *self, NMWimaxNsp *nsp);
+} NMDeviceWimaxClass;
+

 

-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

 

 

 

-
nm_device_wimax_get_center_frequency ()

-
guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);

+
nm_device_wimax_new ()

+
GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
+                                                         const char *path);

 

-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.
+Creates a new NMDeviceWimax.
 

-

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
self :
a NMDeviceWimax
+
connection :
the DBusGConnection
 
 

 
path :
the D-Bus object path of the WiMAX device

 
Returns :
the center frequency in KHz, or 0a new WiMAX device. [transfer full]
+
 

 
 

 

 

 

-
nm_device_wimax_get_cinr ()

-
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);

+
nm_device_wimax_get_hw_address ()

+
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

 

-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.
+Gets the hardware (MAC) address of the NMDeviceWimax
 

-

+

+++
-
+
-
+

 


 
 
self :
wimax :

 a NMDeviceWimax
 
 

 

 
Returns :
the CINR in dB, or 0the hardware address. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_wimax_get_hw_address ()

-
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

+
nm_device_wimax_get_active_nsp ()

+
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

 

-Gets the hardware (MAC) address of the NMDeviceWimax
+Gets the active NMWimaxNsp.
 

-

+

+++
@@ -365,8 +337,8 @@ Gets the hardware (MAC) address of the 
 
-
+

 


 
 

 
wimax :

 
Returns :
the hardware address. This is the internal string used by the
-device, and must not be modified.the access point or NULL if none is active. [transfer full]
+
 

 
 

@@ -379,8 +351,11 @@ device, and must not be modified.
 

 Gets a NMWimaxNsp by path.
 

-

+

+++
@@ -393,7 +368,7 @@ Gets a Returns :

-
@@ -406,8 +381,11 @@ Gets a NMDeviceWimax.
 

-

 


 
 

 
wimax :
the access point or NULL if none is found. [transfer none]
+the access point or NULL if none is found. [transfer none]
 
 

 

+

+++
@@ -426,6 +404,34 @@ The returned array is owned by the client and should not be modified. 
 

 

+
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.
+

+

 


 
 

 
wimax :

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




self :
a NMDeviceWimax
+
Returns :
the center frequency in KHz, or 0

+

+

+

 
nm_device_wimax_get_rssi ()

 
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);

 

@@ -434,8 +440,11 @@ 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.
 

-

+

+++
@@ -451,6 +460,33 @@ device is not connected.
 

+
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 :

 
 

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




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);

 

@@ -458,8 +494,11 @@ 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.
 

-

+

+++
@@ -475,27 +514,25 @@ Average power of the last burst transmitted by the device, in units of
 

-
nm_device_wimax_new ()

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

+
nm_device_wimax_get_bsid ()

+
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

 

-Creates a new NMDeviceWimax.
+Gets the ID of the serving Base Station when the device is connected.
 

-

 


 
 

 
self :

 
 

+

+++
-
-
+
-
-
-
-
-
@@ -586,8 +623,11 @@ Average power of the last burst transmitted by the device, in units of
 

 Notifies that a NMWimaxNsp is added to the wimax device.
 

-

 


 
 
connection :
the DBusGConnection
+
self :
a NMDeviceWimax
 
 

 
path :
the D-Bus object path of the WiMAX device

 
Returns :
a new WiMAX device. [transfer full]
+the ID of the serving Base Station, or NULL
 
 

 

+

+++
@@ -613,8 +653,11 @@ Notifies that a 
 Notifies that a NMWimaxNsp is removed from the wimax device.
 

-

 


 
 

 
self :

+

+++
@@ -635,6 +678,6 @@ Notifies that a 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index b828b574..7aa6f67d 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -3,12 +3,12 @@
 
 
 NMIP4Config
-
+
 
 
 
 
-
+
 
 
 
@@ -46,17 +46,17 @@
 
                    NMIP4Config;
                     NMIP4ConfigClass;
 #define             NM_IP4_CONFIG_ADDRESSES
-#define             NM_IP4_CONFIG_DOMAINS
 #define             NM_IP4_CONFIG_NAMESERVERS
+#define             NM_IP4_CONFIG_DOMAINS
 #define             NM_IP4_CONFIG_ROUTES
 #define             NM_IP4_CONFIG_WINS_SERVERS
+GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);
 const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);
-const GPtrArray *   nm_ip4_config_get_domains           (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);
-GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
 

@@ -124,16 +124,16 @@ NMIP4Config implements
 

-
NM_IP4_CONFIG_DOMAINS

-
#define NM_IP4_CONFIG_DOMAINS "domains"
+
NM_IP4_CONFIG_NAMESERVERS

+
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 

 

 

 

-
NM_IP4_CONFIG_NAMESERVERS

-
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
+
NM_IP4_CONFIG_DOMAINS

+
#define NM_IP4_CONFIG_DOMAINS "domains"
 

 

 

@@ -156,23 +156,30 @@ NMIP4Config implements
 

-
nm_ip4_config_get_addresses ()

-
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

+
nm_ip4_config_new ()

+
GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);

 

-Gets the IP4 addresses (containing the address, prefix, and gateway).
+Creates a new NMIP4Config.
 

-

 


 
 

 
self :

 
 
 
 
 
 
 
 

+

+++
-
-
+
+
+
+
+
-
@@ -180,13 +187,16 @@ This is the internal copy used by the configuration and must not be modified. 
 

 

-
nm_ip4_config_get_domains ()

-
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

+
nm_ip4_config_get_addresses ()

+
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

 

-Gets the domain names.
+Gets the IP4 addresses (containing the address, prefix, and gateway).
 

-

 


 
 
config :
a NMIP4Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

 
Returns :
the GSList containing NMIP4Addresses.
-This is the internal copy used by the configuration and must not be modified. [element-type NetworkManager.IP4Address]
+a new IP4 configuration. [transfer full]
 
 

 

+

+++
 
@@ -195,8 +205,8 @@ Gets the domain names.
 
-
@@ -209,8 +219,11 @@ internal copy used by the configuration, and must not be modified. 

 


 

 
config :

 

 
Returns :
the GPtrArray containing domains as strings. This is the
-internal copy used by the configuration, and must not be modified. [element-type utf8]
+the GSList containing NMIP4Addresses.
+This is the internal copy used by the configuration and must not be modified. [element-type NetworkManager.IP4Address]
 
 

 

+

+++
 
@@ -228,13 +241,16 @@ configuration and must not be modified. [
 

 

-
nm_ip4_config_get_routes ()

-
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

+
nm_ip4_config_get_domains ()

+
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

 

-Gets the routes.
+Gets the domain names.
 

-

 


 

 
config :

+

+++
 
@@ -243,9 +259,8 @@ Gets the routes.
 
-
@@ -253,13 +268,16 @@ and must not be modified. [
-
nm_ip4_config_get_wins_servers ()

-
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

+
nm_ip4_config_get_routes ()

+
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

 

-Gets the Windows Internet Name Service servers (WINS).
+Gets the routes.
 

-

 


 

 
config :

 

 
Returns :
the GSList containing
-NMIP4Routes. This is the internal copy used by the configuration,
-and must not be modified. [element-type NetworkManager.IP4Route]
+the GPtrArray containing domains as strings. This is the
+internal copy used by the configuration, and must not be modified. [element-type utf8]
 
 

 

+

+++
 
@@ -268,8 +286,9 @@ Gets the Windows Internet Name Service servers (WINS).
 
-
@@ -277,27 +296,26 @@ This is the internal copy used by the configuration and must not be modified. 
 

 

-
nm_ip4_config_new ()

-
GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);

+
nm_ip4_config_get_wins_servers ()

+
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

 

-Creates a new NMIP4Config.
+Gets the Windows Internet Name Service servers (WINS).
 

-

 


 

 
config :

 

 
Returns :
the GArray containing guint32s.
-This is the internal copy used by the configuration and must not be modified. [element-type guint32]
+the GSList containing
+NMIP4Routes. This is the internal copy used by the configuration,
+and must not be modified. [element-type NetworkManager.IP4Route]
 
 

 

+

+++
 
-
-
+
-
-
-
-
-
@@ -349,6 +367,6 @@ The 
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index bc6c9d53..67518a3d 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -3,12 +3,12 @@
 
 
 NMIP6Config
-
+
 
 
 
 
-
+
 
 
 
@@ -46,15 +46,15 @@
 
                    NMIP6Config;
                     NMIP6ConfigClass;
 #define             NM_IP6_CONFIG_ADDRESSES
-#define             NM_IP6_CONFIG_DOMAINS
 #define             NM_IP6_CONFIG_NAMESERVERS
+#define             NM_IP6_CONFIG_DOMAINS
 #define             NM_IP6_CONFIG_ROUTES
+GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);
 const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);
-const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);
 const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);
+const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);
 const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);
-GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
 

 
 

@@ -121,16 +121,16 @@ NMIP6Config implements
 

 

 

-
NM_IP6_CONFIG_DOMAINS

-
#define NM_IP6_CONFIG_DOMAINS "domains"
+
NM_IP6_CONFIG_NAMESERVERS

+
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 

 

 

 

 

 

-
NM_IP6_CONFIG_NAMESERVERS

-
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
+
NM_IP6_CONFIG_DOMAINS

+
#define NM_IP6_CONFIG_DOMAINS "domains"
 

 

 

@@ -145,24 +145,30 @@ NMIP6Config implements
 

 

 

-
nm_ip6_config_get_addresses ()

-
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

+
nm_ip6_config_new ()

+
GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);

 

-Gets the IP6 addresses (containing the address, prefix, and gateway).
+Creates a new NMIP6Config.
 

-

 


 
connection :
the DBusGConnection
+
config :
a NMIP4Config
 
 

 
object_path :
the DBus object path of the device

 
Returns :
a new IP4 configuration. [transfer full]
+the GArray containing guint32s.
+This is the internal copy used by the configuration and must not be modified. [element-type guint32]
 
 

 

+

+++
 
-
-
+
+
+
+
+
-
@@ -170,13 +176,16 @@ and must not be modified. [
-
nm_ip6_config_get_domains ()

-
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

+
nm_ip6_config_get_addresses ()

+
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

 

-Gets the domain names.
+Gets the IP6 addresses (containing the address, prefix, and gateway).
 

-

 


 
config :
a NMIP6Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

 
Returns :
the GSList containing
-NMIP6Addresses. This is the internal copy used by the configuration
-and must not be modified. [element-type NetworkManager.IP6Address]
+a new IP6 configuration. [transfer full]
 
 

 

+

+++
 
@@ -185,8 +194,9 @@ Gets the domain names.
 
-
@@ -199,8 +209,11 @@ This is the internal copy used by the configuration, and must not be modified. <
 

 Gets the domain name servers (DNS).
 

-

 


 

 
config :

 

 
Returns :
the GPtrArray containing domains as strings.
-This is the internal copy used by the configuration, and must not be modified. [element-type utf8]
+the GSList containing
+NMIP6Addresses. This is the internal copy used by the configuration
+and must not be modified. [element-type NetworkManager.IP6Address]
 
 

 

+

+++
 
@@ -209,23 +222,25 @@ Gets the domain name servers (DNS).
 
-
+

 


 

 
config :

 

 
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. [element-type Posix.in6_addr]
-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.
 

 
 

 

 

 

-
nm_ip6_config_get_routes ()

-
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

+
nm_ip6_config_get_domains ()

+
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

 

-Gets the routes.
+Gets the domain names.
 

-

+

+++
@@ -234,9 +249,8 @@ Gets the routes.
 
-
@@ -244,27 +258,27 @@ and must not be modified. [
-
nm_ip6_config_new ()

-
GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);

+
nm_ip6_config_get_routes ()

+
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

 

-Creates a new NMIP6Config.
+Gets the routes.
 

-

 


 
 

 
config :

 

 
Returns :
the GSList containing
-NMIP6Routes. This is the internal copy used by the configuration,
-and must not be modified. [element-type NetworkManager.IP6Route]
+the GPtrArray containing domains as strings.
+This is the internal copy used by the configuration, and must not be modified. [element-type utf8]
 
 

 

+

+++
-
-
+
-
-
-
-
-
@@ -313,6 +327,6 @@ The 
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index ea763de7..99b05001 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -3,12 +3,12 @@
 
 
 NMObject
-
+
 
 
 
 
-
+
 
 
 
@@ -45,13 +45,13 @@
 

 


 
 
connection :
the DBusGConnection
+
config :
a NMIP6Config
 
 

 
object_path :
the DBus object path of the device

 
Returns :
a new IP6 configuration. [transfer full]
+the GSList containing
+NMIP6Routes. This is the internal copy used by the configuration,
+and must not be modified. [element-type NetworkManager.IP6Route]
 
 

 

 

 
Synopsis

-
                    NMObject;
-                    NMObjectClass;
-enum                NMObjectError;
-#define             NM_OBJECT_DBUS_CONNECTION
-#define             NM_OBJECT_DBUS_PATH
+
enum                NMObjectError;
 #define             NM_OBJECT_ERROR
 GQuark              nm_object_error_quark               (void);
+#define             NM_OBJECT_DBUS_CONNECTION
+#define             NM_OBJECT_DBUS_PATH
+                    NMObject;
+                    NMObjectClass;
 DBusGConnection *   nm_object_get_connection            (NMObject *object);
 const char *        nm_object_get_path                  (NMObject *object);
 

@@ -99,40 +99,6 @@ NMObject implements
 

 
Details

 

-
NMObject

-
typedef struct _NMObject NMObject;

-

-

-

-

-

-
NMObjectClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	/* The "object-creation-failed" signal is PRIVATE for libnm-glib and
-	 * is not meant for any external usage.  It indicates that an error
-	 * occured during creation of an object.
-	 */
-	void (*object_creation_failed) (NMObject *master_object,
-	                                GError *error,
-	                                char *failed_path);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMObjectClass;
-

-

-

-

-

-

 
enum NMObjectError

 
typedef enum {
 	NM_OBJECT_ERROR_UNKNOWN = 0,
@@ -142,8 +108,11 @@ NMObject implements
 

 Describes errors that may result from operations involving a NMObject.
 

-

+

+++
@@ -160,6 +129,32 @@ Describes errors that may result from operations involving a 
 

 

+
NM_OBJECT_ERROR

+
#define NM_OBJECT_ERROR nm_object_error_quark ()
+

+

+

+

+

+

+
nm_object_error_quark ()

+
GQuark              nm_object_error_quark               (void);

+

+Registers an error quark for NMObject if necessary.
+

+

 


 
 

 
NM_OBJECT_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMObject errors.

+

+

+

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

@@ -176,26 +171,37 @@ Describes errors that may result from operations involving a 
 

 

-
NM_OBJECT_ERROR

-
#define NM_OBJECT_ERROR nm_object_error_quark ()
-

+
NMObject

+
typedef struct _NMObject NMObject;

 

 

 

 

 

-
nm_object_error_quark ()

-
GQuark              nm_object_error_quark               (void);

+
NMObjectClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	/* The "object-creation-failed" signal is PRIVATE for libnm-glib and
+	 * is not meant for any external usage.  It indicates that an error
+	 * occured during creation of an object.
+	 */
+	void (*object_creation_failed) (NMObject *master_object,
+	                                GError *error,
+	                                char *failed_path);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMObjectClass;
+

 

-Registers an error quark for NMObject if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMObject errors.

 

 

 

@@ -204,8 +210,11 @@ Registers an error quark for NMObject's DBusGConnection.
 

-

+

+++
@@ -227,8 +236,11 @@ Gets the NMObject.
 

-

 


 
 

 
object :

+

+++
@@ -275,8 +287,11 @@ during property handling of master_object
-

 


 
 

 
object :

+

+++
@@ -301,6 +316,6 @@ Note: Be aware that the signal is private for libnm-glib's internal
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index a1c923dd..127b665b 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -3,12 +3,12 @@
 NMRemoteConnection
-
+
-
+
@@ -45,7 +45,9 @@
 

 


 
 

 
master_object :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMRemoteConnection;
+
#define             NM_REMOTE_CONNECTION_UPDATED
+#define             NM_REMOTE_CONNECTION_REMOVED
+                    NMRemoteConnection;
                     NMRemoteConnectionClass;
 void                (*NMRemoteConnectionCommitFunc)     (NMRemoteConnection *connection,
                                                          GError *error,
@@ -57,8 +59,8 @@
                                                          GHashTable *secrets,
                                                          GError *error,
                                                          gpointer user_data);
-#define             NM_REMOTE_CONNECTION_REMOVED
-#define             NM_REMOTE_CONNECTION_UPDATED
+NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
+                                                         const char *path);
 void                nm_remote_connection_commit_changes (NMRemoteConnection *connection,
                                                          NMRemoteConnectionCommitFunc callback,
                                                          gpointer user_data);
@@ -69,8 +71,6 @@
                                                          const char *setting_name,
                                                          NMRemoteConnectionGetSecretsFunc callback,
                                                          gpointer user_data);
-NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         const char *path);
 

 

 

@@ -111,6 +111,22 @@ NMRemoteConnection implements
 

 
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;

 

@@ -150,8 +166,11 @@ NMRemoteConnection implements
 Called when NetworkManager has committed outstanding changes to a connection
 to backing storage as a result of nm_remote_connection_commit_changes().
 

-

+

+++
@@ -179,8 +198,11 @@ to backing storage as a result of nm_remote_connection_delete().
 

-

 


 
 

 
connection :

+

+++
@@ -209,8 +231,11 @@ Called when NetworkManager has deleted a connection as a result of
 Called when NetworkManager returns secrets in response to a request for
 secrets via nm_remote_connection_get_secrets().
 

-

 


 
 

 
connection :

+

+++
@@ -237,19 +262,32 @@ containing that property's value. [
-
NM_REMOTE_CONNECTION_REMOVED

-
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
-

-

-

-
-

-

-
NM_REMOTE_CONNECTION_UPDATED

-
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
-

+
nm_remote_connection_new ()

+
NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
+                                                         const char *path);

 

+Creates a new object representing the remote connection.
 

+

 


 
 

 
connection :

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




bus :
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

 

 

 

@@ -261,8 +299,11 @@ containing that property's value. [
+

+++
@@ -292,8 +333,11 @@ commit completes. [

 


 
 

 
connection :

+

+++
@@ -323,8 +367,11 @@ Delete the connection.
 

 Request the connection's secrets.
 

-

 


 
 

 
connection :

+

+++
@@ -338,7 +385,7 @@ Request the connection's secrets.
 
@@ -349,32 +396,6 @@ must not be NULL. [
-
nm_remote_connection_new ()

-
NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         const char *path);

-

-Creates a new object representing the remote connection.
-

-

 


 
 

 
connection :

 
callback :

 a function to be called when the update completes;
-must not be NULL. [scope async]
+must not be NULL. [scope async]
 
 

 

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


bus :
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

-

 

 

 
Property Details

@@ -407,8 +428,11 @@ Creates a new object representing the remote connection.
 This signal is emitted when a connection is either deleted or becomes
 invisible to the current user.
 

-

+

+++
@@ -431,8 +455,11 @@ invisible to the current user.
 This signal is emitted when a connection changes, and it is
 still visible to the user.
 

-

 


 
 

 
connection :

+

+++
@@ -454,8 +481,11 @@ still visible to the user.
                                                         gpointer            user_data)               : Run First

 

-

 


 
 

 
connection :

 

+

+++
@@ -472,6 +502,6 @@ still visible to the user.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 4ed57b08..aeaf748e 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -3,12 +3,12 @@
 NMRemoteSettings
-
+
-
+
@@ -45,43 +45,43 @@
 

 


 
 

 
nmremoteconnection :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
struct              NMRemoteSettings;
+
enum                NMRemoteSettingsError;
+#define             NM_REMOTE_SETTINGS_ERROR
+GQuark              nm_remote_settings_error_quark      (void);
+#define             NM_REMOTE_SETTINGS_BUS
+#define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
+#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);
-struct              NMRemoteSettingsClass;
-enum                NMRemoteSettingsError;
 void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
                                                          GError *error,
                                                          gpointer user_data);
-#define             NM_REMOTE_SETTINGS_BUS
-#define             NM_REMOTE_SETTINGS_CAN_MODIFY
-#define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
-#define             NM_REMOTE_SETTINGS_ERROR
-#define             NM_REMOTE_SETTINGS_HOSTNAME
-#define             NM_REMOTE_SETTINGS_NEW_CONNECTION
-#define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
-gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
-                                                         NMRemoteSettingsAddConnectionFunc callback,
+struct              NMRemoteSettings;
+struct              NMRemoteSettingsClass;
+NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
+void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
                                                          gpointer user_data);
-GQuark              nm_remote_settings_error_quark      (void);
+NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);
+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);
-GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
-NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
-void                nm_remote_settings_new_async        (DBusGConnection *bus,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
+gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
+                                                         NMConnection *connection,
+                                                         NMRemoteSettingsAddConnectionFunc callback,
                                                          gpointer user_data);
-NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
-                                                         GError **error);
 gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
                                                          const char *hostname,
                                                          NMRemoteSettingsSaveHostnameFunc callback,
@@ -125,48 +125,6 @@ NMRemoteSettings implements
 

 
Details

 

-
struct NMRemoteSettings

-
struct NMRemoteSettings;

-

-

-

-

-

-
NMRemoteSettingsAddConnectionFunc ()

-
void                (*NMRemoteSettingsAddConnectionFunc)
-                                                        (NMRemoteSettings *settings,
-                                                         NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

-

-

-

-
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);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-

-

-

-

-

-

 
enum NMRemoteSettingsError

 
typedef enum {
 	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
@@ -177,8 +135,11 @@ NMRemoteSettings implements
 

 Describes errors that may result from operations involving a NMRemoteSettings.
 

-

+

+++
@@ -202,15 +163,32 @@ Describes errors that may result from operations involving a 
 

 

-
NMRemoteSettingsSaveHostnameFunc ()

-
void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                                         GError *error,
-                                                         gpointer user_data);

+
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.
+

+

 


 
 

 
NM_REMOTE_SETTINGS_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMRemoteSettings errors.

+

+

+

 
NM_REMOTE_SETTINGS_BUS

 
#define NM_REMOTE_SETTINGS_BUS             "bus"
 

@@ -219,6 +197,22 @@ Describes errors that may result from operations involving a 
 

 

+
NM_REMOTE_SETTINGS_SERVICE_RUNNING

+
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+

+

+

+

+

+

+
NM_REMOTE_SETTINGS_HOSTNAME

+
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_CAN_MODIFY

 
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
 

@@ -227,6 +221,14 @@ Describes errors that may result from operations involving a 
 

 

+
NM_REMOTE_SETTINGS_NEW_CONNECTION

+
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_CONNECTIONS_READ

 
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
 

@@ -235,117 +237,121 @@ Describes errors that may result from operations involving a 
 

 

-
NM_REMOTE_SETTINGS_ERROR

-
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
-

+
NMRemoteSettingsAddConnectionFunc ()

+
void                (*NMRemoteSettingsAddConnectionFunc)
+                                                        (NMRemoteSettings *settings,
+                                                         NMRemoteConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

 

 

 

 

 

-
NM_REMOTE_SETTINGS_HOSTNAME

-
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
-

+
NMRemoteSettingsSaveHostnameFunc ()

+
void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
+                                                         GError *error,
+                                                         gpointer user_data);

 

 

 

 

 

-
NM_REMOTE_SETTINGS_NEW_CONNECTION

-
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
-

+
struct NMRemoteSettings

+
struct NMRemoteSettings;

 

 

 

 

 

-
NM_REMOTE_SETTINGS_SERVICE_RUNNING

-
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+
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);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
 

 

 

 

 

 

-
nm_remote_settings_add_connection ()

-
gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
-                                                         NMRemoteSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);

+
nm_remote_settings_new ()

+
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

 

-Requests that the remote settings service add the given settings to a new
-connection.
+Creates a new object representing the remote settings service.
 

-

+

+Note that this will do blocking D-Bus calls to initialize the
+settings object. You can use nm_remote_settings_new_async() if you
+want to avoid that.
+

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+

 


 
 
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. [closure]
+
bus :
a valid and connected D-Bus connection. [allow-none]
 
 

 

 
Returns :
TRUE if the request was successful, FALSE if it failedthe new remote settings object on success, or NULL on failure
 

 
 

 

 

 

-
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_get_connection_by_path ()

-
NMRemoteConnection * nm_remote_settings_get_connection_by_path
-                                                        (NMRemoteSettings *settings,
-                                                         const char *path);

+
nm_remote_settings_new_async ()

+
void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

-Returns the NMRemoteConnection representing the connection at path.
+Creates a new object representing the remote settings service and
+begins asynchronously initializing it. callback will be called
+when it is done; use nm_remote_settings_new_finish() to get the
+result.
 

-

+

+++
-
-
+
-
-
+
+
-
-
+
+
+
+
+
@@ -353,30 +359,31 @@ not known. [
-
nm_remote_settings_get_connection_by_uuid ()

-
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
-                                                        (NMRemoteSettings *settings,
-                                                         const char *uuid);

+
nm_remote_settings_new_finish ()

+
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);

 

-Returns the NMRemoteConnection identified by uuid.
+Gets the result of an nm_remote_settings_new_async() call.
 

-

 


 
 
settings :
the NMRemoteSettings
+
bus :
a valid and connected D-Bus connection. [allow-none]
 
 

 
path :
the D-Bus object path of the remote connection
cancellable :
a GCancellable, or NULL
+
 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
+
callback :
callback to call when the settings object is created
user_data :
data for callback
 
 

 

+

+++
-
-
+
-
-
+
+
-
+

 


 
 
settings :
the NMRemoteSettings
+
result :
a GAsyncResult
 
 

 
uuid :
the UUID of the remote connection
error :
location for a GError, or NULL
+
 

 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
-a new NMRemoteSettings object, or NULL on error
 

 
 

@@ -385,8 +392,11 @@ not known. [
 
nm_remote_settings_list_connections ()

 
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

-

+

+++
@@ -408,64 +418,65 @@ using 
-
nm_remote_settings_new ()

-
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

-

-Creates a new object representing the remote settings service.
-

+
nm_remote_settings_get_connection_by_path ()

+
NMRemoteConnection * nm_remote_settings_get_connection_by_path
+                                                        (NMRemoteSettings *settings,
+                                                         const char *path);

-Note that this will do blocking D-Bus calls to initialize the
-settings object. You can use nm_remote_settings_new_async() if you
-want to avoid that.
+Returns the NMRemoteConnection representing the connection at path.
 

-

 


 
 

 
settings :

 

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
bus :
a valid and connected D-Bus connection. [allow-none]
+
settings :
the NMRemoteSettings
 
 

 
path :
the D-Bus object path of the remote connection

 
Returns :
the new remote settings object on success, or NULL on failurethe remote connection object on success, or NULL if the object was
+not known. [transfer none]
+
 

 
 

 

 

 

-
nm_remote_settings_new_async ()

-
void                nm_remote_settings_new_async        (DBusGConnection *bus,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

+
nm_remote_settings_get_connection_by_uuid ()

+
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
+                                                        (NMRemoteSettings *settings,
+                                                         const char *uuid);

 

-Creates a new object representing the remote settings service and
-begins asynchronously initializing it. callback will be called
-when it is done; use nm_remote_settings_new_finish() to get the
-result.
+Returns the NMRemoteConnection identified by uuid.
 

-

+

+++
-
-
-
-
-
-
+
-
-
+
+
-
-
+
@@ -473,28 +484,44 @@ result.
 

-
nm_remote_settings_new_finish ()

-
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
-                                                         GError **error);

+
nm_remote_settings_add_connection ()

+
gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
+                                                         NMConnection *connection,
+                                                         NMRemoteSettingsAddConnectionFunc callback,
+                                                         gpointer user_data);

 

-Gets the result of an nm_remote_settings_new_async() call.
+Requests that the remote settings service add the given settings to a new
+connection.
 

-

 


 
 
bus :
a valid and connected D-Bus connection. [allow-none]
-
cancellable :
a GCancellable, or NULL
+
settings :
the NMRemoteSettings
 
 

 
callback :
callback to call when the settings object is created
uuid :
the UUID of the remote connection
 

 
user_data :
data for callback
+
Returns :
the remote connection object on success, or NULL if the object was
+not known. [transfer none]
 
 

 
 
 

+

+++
-
-
+
-
-
+
+
+
+
+
+
+
+
+
-
+

 


 
 
result :
a GAsyncResult
+
settings :
the NMRemoteSettings
 
 

 
error :
location for a GError, or NULL
+
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. [closure]
 
 

 

 
Returns :
a new NMRemoteSettings object, or NULL on errorTRUE if the request was successful, FALSE if it failed
 

 
 

@@ -510,8 +537,11 @@ Gets the result of an 
+

+++
@@ -520,7 +550,7 @@ or cleared.
 
-
@@ -579,8 +609,11 @@ hostname operation completes. [gpointer          user_data)             : Run First
 

 

-

 


 
 

 
settings :

 

 
hostname :
the new persistent hostname to set, or NULL to clear any existing
+the new persistent hostname to set, or NULL to clear any existing
 persistent hostname
 

 

+

+++
@@ -601,8 +634,11 @@ hostname operation completes. [gpointer          user_data)             : Run First
 

 

-

 


 
 

 
nmremotesettings :

+

+++
@@ -619,6 +655,6 @@ hostname operation completes. [
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index b5b050f7..671cd029 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -3,12 +3,12 @@
 
 
 NMSecretAgent
-
+
 
 
 
 
-
+
 
 
 
@@ -43,14 +43,15 @@
 

 


 
 

 
nmremotesettings :

 

 
Synopsis

-
                    NMSecretAgent;
-                    NMSecretAgentClass;
-void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
+
#define             NM_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_REGISTERED
+#define             NM_SECRET_AGENT_REGISTRATION_RESULT
+                    NMSecretAgent;
 void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
                                                          NMConnection *connection,
                                                          GHashTable *secrets,
@@ -60,16 +61,13 @@ enum                NMConnection *connection,
                                                          GError *error,
                                                          gpointer user_data);
-#define             NM_SECRET_AGENT_AUTO_REGISTER
-#define             NM_SECRET_AGENT_ERROR
-#define             NM_SECRET_AGENT_IDENTIFIER
-#define             NM_SECRET_AGENT_REGISTERED
-#define             NM_SECRET_AGENT_REGISTRATION_RESULT
-void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
                                                          NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         GError *error,
                                                          gpointer user_data);
-GQuark              nm_secret_agent_error_quark         (void);
+                    NMSecretAgentClass;
+gboolean            nm_secret_agent_register            (NMSecretAgent *self);
+gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
 gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);
 void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
                                                          NMConnection *connection,
@@ -78,12 +76,14 @@ enum                NMSecretAgentGetSecretsFlags flags,
                                                          NMSecretAgentGetSecretsFunc callback,
                                                          gpointer user_data);
-gboolean            nm_secret_agent_register            (NMSecretAgent *self);
 void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          NMSecretAgentSaveSecretsFunc callback,
                                                          gpointer user_data);
-gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
+void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer user_data);
 

 

 

@@ -115,121 +115,18 @@ enum                
 
Details

 

-
NMSecretAgent

-
typedef struct _NMSecretAgent NMSecretAgent;

-

-

-

-

-

-
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 'user_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 user_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 'user_data'
-	 * of course).
-	 */
-	void (*save_secrets) (NMSecretAgent *agent,
-	                      NMConnection *connection,
-	                      const char *connection_path,
-	                      NMSecretAgentSaveSecretsFunc callback,
-	                      gpointer user_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 'user_data'
-	 * of course).
-	 */
-	void (*delete_secrets) (NMSecretAgent *agent,
-	                        NMConnection *connection,
-	                        const char *connection_path,
-	                        NMSecretAgentDeleteSecretsFunc callback,
-	                        gpointer user_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_ERROR

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 

 

 

 

 

 

-
NMSecretAgentDeleteSecretsFunc ()

-
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

+
nm_secret_agent_error_quark ()

+
GQuark              nm_secret_agent_error_quark         (void);

 

-Called as a result of a request by NM to delete secrets.  When the
-NMSecretAgent subclass has finished deleting the secrets, this function
-should be called.
 

-

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


agent :
the secret agent object
connection :
the connection for which secrets were to be deleted,
-note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
-has returned. [transfer none]
-
error :
if the deleting secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

@@ -247,8 +144,11 @@ has returned. [NMSecretAgentError values are passed by secret agents back to NetworkManager
 when they encounter problems retrieving secrets on behalf of NM.
 

-

+

+++
@@ -301,8 +201,11 @@ when they encounter problems retrieving secrets on behalf of NM.
 

 NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
 

-

 


 
 

 
NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED

+

+++
@@ -339,6 +242,45 @@ results or carrier changes.
 

+
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_REGISTERED

+
#define NM_SECRET_AGENT_REGISTERED          "registered"
+

+

+

+

+

+

+
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,
@@ -356,7 +298,7 @@ To easily create the hash table to return the WiFi PSK, you could do
 something like this:
 

 

-
Example 1. Creating a secrets hash

+
Example 1. Creating a secrets hash

 

   

 


 
 

 
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE

 
 

@@ -385,7 +327,7 @@ something like this:
 s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();g_object_set (G_OBJECT (s_wsec),              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
+              NULL);nm_connection_add_setting (secrets, NM_SETTING (s_wsec));secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
@@ -401,8 +343,11 @@ something like this:
 


 

-

     
 
 
 
 
 

+

+++
@@ -450,8 +395,11 @@ Called as a result of a request by NM to save secrets.  When the
 NMSecretAgent subclass has finished saving the secrets, this function
 should be called.
 

-

 


 
 

 
agent :

+

+++
@@ -478,60 +426,134 @@ has returned. [
-
NM_SECRET_AGENT_AUTO_REGISTER

-
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
-

-

-

-
-

-

-
NM_SECRET_AGENT_ERROR

-
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-

-

-

-

-

-

-
NM_SECRET_AGENT_IDENTIFIER

-
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
-

-

-

-

-

-

-
NM_SECRET_AGENT_REGISTERED

-
#define NM_SECRET_AGENT_REGISTERED          "registered"
-

+
NMSecretAgentDeleteSecretsFunc ()

+
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

 

+Called as a result of a request by NM to delete secrets.  When the
+NMSecretAgent subclass has finished deleting the secrets, this function
+should be called.
 

+

 


 
 

 
agent :

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




agent :
the secret agent object
connection :
the connection for which secrets were to be deleted,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
error :
if the deleting secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

-
NM_SECRET_AGENT_REGISTRATION_RESULT

-
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+
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 'self', 'callback',
+	 * and 'user_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 *self,
+	                     NMConnection *connection,
+	                     const char *connection_path,
+	                     const char *setting_name,
+	                     const char **hints,
+	                     NMSecretAgentGetSecretsFlags flags,
+	                     NMSecretAgentGetSecretsFunc callback,
+	                     gpointer user_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 *self,
+	                            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 'self', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*save_secrets) (NMSecretAgent *self,
+	                      NMConnection *connection,
+	                      const char *connection_path,
+	                      NMSecretAgentSaveSecretsFunc callback,
+	                      gpointer user_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 'self', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*delete_secrets) (NMSecretAgent *self,
+	                        NMConnection *connection,
+	                        const char *connection_path,
+	                        NMSecretAgentDeleteSecretsFunc callback,
+	                        gpointer user_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_delete_secrets ()

-
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);

-

-Asynchronously ask the agent to delete all saved secrets belonging to
-connection.
-

+
nm_secret_agent_register ()

+
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

 

-VFunc: delete_secrets
+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.
 

-

+

+++
@@ -539,36 +561,50 @@ VFunc: delete_secrets
 
-
-
-
-
-
-
-
-
-
-
+
+

 


 
 

 
self :

 

 
connection :
a NMConnection
-
callback :
a callback, to be invoked when the operation is done. [scope async]
-
user_data :
caller-specific data to be passed to callback. [closure]
-
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_error_quark ()

-
GQuark              nm_secret_agent_error_quark         (void);

+
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_registered ()

 
gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);

-

+

+++
@@ -600,10 +636,13 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.
 

-VFunc: get_secrets
+Virtual: get_secrets
 

-

 


 
 

 
self :

 

+

+++
@@ -642,34 +681,6 @@ VFunc: get_secrets
 

-
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 :

 
 

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


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_save_secrets ()

 
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
@@ -680,10 +691,13 @@ Asyncronously ensure that all secrets inside connect
 are stored to disk.
 

 

-VFunc: save_secrets
+Virtual: save_secrets
 

-

+

+++
@@ -710,15 +724,23 @@ VFunc: save_secrets
 

-
nm_secret_agent_unregister ()

-
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

+
nm_secret_agent_delete_secrets ()

+
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer user_data);

 

-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.
+Asynchronously ask the agent to delete all saved secrets belonging to
+connection.
+

+

+Virtual: delete_secrets
 

-

 


 
 

 
self :

 
 

+

+++
@@ -726,8 +748,19 @@ store secrets on behalf of this user.
 
-
-
+
+
+
+
+
+
+
+
+
+

 


 
 

 
self :

 

 
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.
connection :
a NMConnection
+
callback :
a callback, to be invoked when the operation is done. [scope async]
+
user_data :
caller-specific data to be passed to callback. [closure]
+
 

 
 

@@ -785,8 +818,11 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 Indicates the result of a registration request; if error is NULL the
 request was successful.
 

-

+

+++
@@ -807,6 +843,6 @@ request was successful.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index cd6d107e..4241b467 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -3,12 +3,12 @@
 NMVPNConnection
-
+
-
+
@@ -45,14 +45,14 @@
 

 


 
 

 
agent :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMVPNConnection;
-                    NMVPNConnectionClass;
+
#define             NM_VPN_CONNECTION_VPN_STATE
 #define             NM_VPN_CONNECTION_BANNER
-#define             NM_VPN_CONNECTION_VPN_STATE
-const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
-NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
+                    NMVPNConnection;
+                    NMVPNConnectionClass;
 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);
 

 

 

@@ -91,6 +91,22 @@ NMVPNConnection implements
 

 
Details

 

+
NM_VPN_CONNECTION_VPN_STATE

+
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
+

+

+

+

+

+

+
NM_VPN_CONNECTION_BANNER

+
#define NM_VPN_CONNECTION_BANNER "banner"
+

+

+

+

+

+

 
NMVPNConnection

 
typedef struct _NMVPNConnection NMVPNConnection;

 

@@ -121,39 +137,31 @@ NMVPNConnection implements
 

 

 

-
NM_VPN_CONNECTION_BANNER

-
#define NM_VPN_CONNECTION_BANNER "banner"
-

-

-

-

-

-

-
NM_VPN_CONNECTION_VPN_STATE

-
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
-

-

-

-

-

-

-
nm_vpn_connection_get_banner ()

-
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

+
nm_vpn_connection_new ()

+
GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
+                                                         const char *path);

 

-Gets the VPN login banner of the active NMVPNConnection.
+Creates a new NMVPNConnection.
 

-

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
vpn :
a NMVPNConnection
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the new connection

 
Returns :
the VPN login banner of the VPN connection. This is the internal
-string used by the connection, and must not be modified.a new connection object. [transfer full]
+
 

 
 

@@ -165,8 +173,11 @@ string used by the connection, and must not be modified.
 

 Gets the current NMVPNConnection state.
 

-

+

+++
@@ -182,28 +193,26 @@ Gets the current 
-
nm_vpn_connection_new ()

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

+
nm_vpn_connection_get_banner ()

+
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

-Creates a new NMVPNConnection.
+Gets the VPN login banner of the active NMVPNConnection.
 

-

 


 
 

 
vpn :

 

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
vpn :
a NMVPNConnection
 
 

 
path :
the DBus object path of the new connection

 
Returns :
a new connection object. [transfer full]
-the VPN login banner of the VPN connection. This is the internal
+string used by the connection, and must not be modified.
 

 
 

@@ -240,8 +249,11 @@ The VPN state of the active VPN connection.
                                                         gpointer         user_data)            : Run First

 

 

-

+

+++
@@ -258,6 +270,6 @@ The VPN state of the active VPN connection.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 9a233d35..34933aaa 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -3,12 +3,12 @@
 NMWimaxNsp
-
+
-
+
@@ -43,21 +43,21 @@
 

 


 
 

 
nmvpnconnection :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMWimaxNsp;
-                    NMWimaxNspClass;
-enum                NMWimaxNspNetworkType;
-#define             NM_WIMAX_NSP_NAME
-#define             NM_WIMAX_NSP_NETWORK_TYPE
+
#define             NM_WIMAX_NSP_NAME
 #define             NM_WIMAX_NSP_SIGNAL_QUALITY
-gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
-GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
-const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
-NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
-guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+#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);
 

 

 

@@ -90,25 +90,24 @@ NMWimaxNsp implements
 

 
Details

 

-
NMWimaxNsp

-
typedef struct _NMWimaxNsp NMWimaxNsp;

+
NM_WIMAX_NSP_NAME

+
#define NM_WIMAX_NSP_NAME           "name"
+

 

 

 

 

 

-
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_SIGNAL_QUALITY

+
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+

+

+

+

+

+

+
NM_WIMAX_NSP_NETWORK_TYPE

+
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

 

 

@@ -125,106 +124,128 @@ NMWimaxNsp implements
 

 

 

+

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




NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

+
NM_WIMAX_NSP_NETWORK_TYPE_HOME

+
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

+
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

+

 

 

 

-
NM_WIMAX_NSP_NAME

-
#define NM_WIMAX_NSP_NAME           "name"
-

-

-

-

-

-

-
NM_WIMAX_NSP_NETWORK_TYPE

-
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
-

+
NMWimaxNsp

+
typedef struct _NMWimaxNsp NMWimaxNsp;

 

 

 

 

 

-
NM_WIMAX_NSP_SIGNAL_QUALITY

-
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+
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_connection_valid ()

-
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);

+
nm_wimax_nsp_new ()

+
GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
+                                                         const char *path);

 

-Validates a given connection against a given WiMAX NSP to ensure that the
-connection may be activated with that NSP.  The connection must match the
-nsp's network name and other attributes.
+Creates a new NMWimaxNsp.
 

-

+

+++
-
-
-
-
-
+
+
+
+
-
+

 


 
 
nsp :
an NMWimaxNsp to validate connection against

 
connection :
an NMConnection to validate against nsp
+the DBusGConnection
 
 

 
path :
the D-Bus object path of the WiMAX NSP

 
Returns :

-TRUE if the connection may be activated with this WiMAX NSP,
-FALSE if it cannot be.a new WiMAX NSP. [transfer full]
+
 

 
 

 

 

 

-
nm_wimax_nsp_filter_connections ()

-
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);

+
nm_wimax_nsp_get_name ()

+
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);

 

-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.
+Gets the name of the wimax NSP
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
nsp :
an NMWimaxNsp to filter connections for
connections :
a list of
-NMConnection objects to filter. [element-type NetworkManager.Connection]
+a NMWimaxNsp
 
 

 

 
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]
-the name
 

 
 

 

 

 

-
nm_wimax_nsp_get_name ()

-
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);

+
nm_wimax_nsp_get_signal_quality ()

+
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

 

-Gets the name of the wimax NSP
+Gets the WPA signal quality of the wimax NSP.
 

-

+

+++
@@ -233,7 +254,7 @@ Gets the name of the wimax NSP
 
-
+

 


 
 

 
nsp :

 

 
Returns :
the namethe signal quality
 

 
 

@@ -245,8 +266,11 @@ Gets the name of the wimax NSP
 

 Gets the network type of the wimax NSP.
 

-

+

+++
@@ -262,50 +286,72 @@ Gets the network type of the wimax NSP.
 

-
nm_wimax_nsp_get_signal_quality ()

-
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

+
nm_wimax_nsp_filter_connections ()

+
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
+                                                         const GSList *connections);

 

-Gets the WPA signal quality of the wimax NSP.
+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 :

 
 

+

+++
-
+
+
+
+
-
+

 


 
 

 
nsp :
a NMWimaxNsp
+an NMWimaxNsp to filter connections for
connections :
a list of
+NMConnection objects to filter. [element-type NetworkManager.Connection]
 
 

 

 
Returns :
the signal qualitya
+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_new ()

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

+
nm_wimax_nsp_connection_valid ()

+
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);

 

-Creates a new NMWimaxNsp.
+Validates a given connection against a given WiMAX NSP to ensure that the
+connection may be activated with that NSP.  The connection must match the
+nsp's network name and other attributes.
 

-

+

+++
-
-
+
+
-
-
+
+
-
+

 


 
 
connection :
the DBusGConnection
-
nsp :
an NMWimaxNsp to validate connection against
 

 
path :
the D-Bus object path of the WiMAX NSP
connection :
an NMConnection to validate against nsp
+
 

 

 
Returns :
a new WiMAX NSP. [transfer full]
-
+TRUE if the connection may be activated with this WiMAX NSP,
+FALSE if it cannot be.
 

 
 

@@ -344,6 +390,6 @@ The signal quality of the WiMAX NSP.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 7555a67a..b8c851e4 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 
 
 Annotation Glossary
-
+
 
 
 
-
+
 
 
 
@@ -20,67 +20,63 @@
  
 
 
-O
+C
                       | 
-                   S
+                   T
                       | 
                    A
                       | 
-                   C
+                   S
+                      | 
+                   E
                       | 
                    T
                       | 
                    A
                       | 
-                   E
+                   T
+                      | 
+                   O
                       | 
                    T
 
 
 

-

-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.

+

+Annotation Glossary

 
C

-

-closure

-
This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

+
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.

+
transfer container

+
Free data container after the code is done.

 
A

-

-array

-
Parameter points to an array of items.

+
allow-none

+
NULL is ok, both for passing and for returning.

+
S

+
scope async

+
The callback is valid until first called.

 
E

-

-element-type

-
Generics and defining elements of containers and arrays.

+
element-type

+
Generics and defining elements of containers and arrays.

+
T

+
transfer none

+
Don't free data after the code is done.

+
A

+
array

+
Parameter points to an array of items.

+
T

+
type

+
Override the parsed C type with given type.

+
O

+
out

+
Parameter for returning results. Default is transfer full.

 
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

+
transfer full

+
Free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ 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
index bd62549a..fd9de82b 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -3,12 +3,12 @@
 
 
 API Index
-
+
 
 
 
 
-
+
 
 
 
@@ -41,8 +41,8 @@
 
 
 

-

-API Index

+

+API Index

 
A

 

 NMAccessPoint, struct in NMAccessPoint
@@ -310,10 +310,18 @@
 

 

 

+NMClient:activating-connection, object property in NMClient
+

+

+

 NMClient:active-connections, object property in NMClient
 

 

 

+NMClient:connectivity, object property in NMClient
+

+

+

 NMClient:manager-running, object property in NMClient
 

 

@@ -322,6 +330,10 @@
 
 

 

+NMClient:primary-connection, object property in NMClient
+

+

+

 NMClient:state, object property in NMClient
 

 

@@ -378,6 +390,10 @@
 
 

 

+NM_CLIENT_ACTIVATING_CONNECTION, macro in NMClient
+

+

+

 NM_CLIENT_ACTIVE_CONNECTIONS, macro in NMClient
 

 

@@ -386,14 +402,38 @@
 
 

 

+nm_client_check_connectivity, function in NMClient
+

+

+

+nm_client_check_connectivity_async, function in NMClient
+

+

+

+nm_client_check_connectivity_finish, function in NMClient
+

+

+

+NM_CLIENT_CONNECTIVITY, macro in NMClient
+

+

+

 nm_client_deactivate_connection, function in NMClient
 

 

 

+nm_client_get_activating_connection, function in NMClient
+

+

+

 nm_client_get_active_connections, function in NMClient
 

 

 

+nm_client_get_connectivity, function in NMClient
+

+

+

 nm_client_get_devices, function in NMClient
 

 

@@ -418,6 +458,10 @@
 
 

 

+nm_client_get_primary_connection, function in NMClient
+

+

+

 nm_client_get_state, function in NMClient
 

 

@@ -454,6 +498,10 @@
 
 

 

+NM_CLIENT_PRIMARY_CONNECTION, macro in NMClient
+

+

+

 nm_client_set_logging, function in NMClient
 

 

@@ -2108,23 +2156,23 @@
 
 

 

-NMVpnPluginUiCapability, enum in NMVpnPluginUiWidget
+NMVpnPluginUiCapability, enum in NMVpnPluginUi
 

 

 

-NMVpnPluginUiFactory, user_function in NMVpnPluginUiWidget
+NMVpnPluginUiFactory, user_function in NMVpnPluginUi
 

 

 

-NMVpnPluginUiInterface, struct in NMVpnPluginUiWidget
+NMVpnPluginUiInterface, struct in NMVpnPluginUi
 

 

 

-NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUiWidget
+NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUi
 

 

 

-NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUiWidget
+NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUi
 

 

 

@@ -2196,55 +2244,55 @@
 

 

 

-nm_vpn_plugin_ui_factory, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_factory, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUi
 

 

 

@@ -2319,6 +2367,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index a739d343..a14eec19 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -3,12 +3,12 @@
 
 
 libnm-glib API Reference
-
+
 
 
 
 
-
+
 
 
 
@@ -20,9 +20,9 @@
 Next
 
 

-

-libnm-glib API Reference

-

+

+libnm-glib API Reference

+

 

 NMClient
 

@@ -105,7 +105,7 @@
 NMVPNPlugin
 
 

-NMVpnPluginUiWidget
+NMVpnPluginUi
 

 

 nm-vpn-plugin-utils
@@ -114,6 +114,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index aec8180a..36d9df96 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -3,10 +3,10 @@
 
 
 libnm-glib Reference Manual
-
+
 
 
-
+
 
 
 
@@ -15,14 +15,14 @@
 

 

 

-      for libnm-glib 0.9.8.0
+      for libnm-glib 0.9.8.8
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
     

 
Copyright © 2012 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
@@ -46,7 +46,7 @@
 

 

 

-

+

 
Object Overview

 
libnm-glib API Reference

 

@@ -132,7 +132,7 @@
 NMVPNPlugin
 
 

-NMVpnPluginUiWidget
+NMVpnPluginUi
 

 

 nm-vpn-plugin-utils
@@ -145,6 +145,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index a839322b..993d7c9a 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -7,10 +7,20 @@
 
 
 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -30,49 +40,51 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
+
 
 
-
-
-
-
-
-
-
-
-
 
 
-
-
-
-
-
-
-
-
 
-
 
+
 
-
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
 
+
 
 
+
 
 
 
@@ -92,25 +104,25 @@
 
 
 
-
-
 
+
+
+
+
 
 
-
 
-
-
-
+
+
+
 
+
+
+
+
 
 
-
 
-
-
-
-
 
 
 
@@ -128,57 +140,57 @@
 
 
 
-
-
-
-
-
-
-
 
-
-
+
+
+
 
 
-
 
-
+
+
+
+
 
+
 
-
-
-
+
 
 
-
+
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
-
-
+
 
 
-
 
-
+
+
+
+
+
 
+
 
-
-
-
+
 
 
-
+
+
+
 
-
-
+
+
+
+
+
 
 
 
@@ -210,25 +222,25 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
+
 
 
 
-
-
+
+
+
+
 
 
 
-
+
 
 
 
@@ -242,8 +254,6 @@
 
 
 
-
-
 
 
 
@@ -252,24 +262,26 @@
 
 
 
-
-
-
-
 
+
 
-
 
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
 
-
+
+
+
+
+
+
+
 
 
 
@@ -288,19 +300,19 @@
 
 
 
-
-
 
 
 
 
 
-
 
-
 
-
+
+
+
+
 
+
 
 
 
@@ -311,8 +323,6 @@
 
 
 
-
-
 
 
 
@@ -320,15 +330,17 @@
 
 
 
-
 
+
 
 
-
-
+
+
+
+
 
 
-
+
 
 
 
@@ -341,33 +353,33 @@
 
 
 
-
-
 
 
 
 
 
 
-
-
-
-
 
+
 
+
+
 
+
 
-
-
-
-
-
+
+
+
+
 
+
 
 
+
 
+
 
-
+
 
 
 
@@ -386,17 +398,17 @@
 
 
 
-
-
 
 
 
 
-
 
 
-
+
+
+
 
+
 
 
 
@@ -406,22 +418,22 @@
 
 
 
-
-
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -433,22 +445,22 @@
 
 
 
-
-
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -460,21 +472,21 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
-
 
-
-
+
+
+
+
 
+
+
 
 
 
@@ -485,23 +497,23 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -513,21 +525,21 @@
 
 
 
-
-
 
 
 
 
-
-
 
-
 
-
-
-
+
+
+
+
+
 
+
+
+
 
 
 
@@ -539,18 +551,22 @@
 
 
 
-
-
-
 
-
 
-
-
+
+
+
+
+
+
+
+
+
 
-
 
-
+
+
+
 
 
 
@@ -562,31 +578,31 @@
 
 
 
-
-
-
 
-
-
-
-
+
 
 
+
+
+
+
 
-
-
-
-
+
+
+
+
 
-
-
-
-
+
 
 
+
+
+
+
 
-
-
+
+
+
 
 
 
@@ -608,16 +624,16 @@
 
 
 
-
 
+
 
 
+
 
-
 
+
 
 
-
 
 
 
@@ -634,14 +650,14 @@
 
 
 
-
 
+
 
+
 
-
 
+
 
-
 
 
 
@@ -657,9 +673,9 @@
 
 
 
-
-
 
+
+
 
 
 
@@ -672,9 +688,9 @@
 
 
 
-
-
 
+
+
 
 
 
@@ -685,15 +701,15 @@
 
 
 
-
-
 
 
 
-
-
 
 
+
+
+
+
 
 
 
@@ -709,17 +725,17 @@
 
 
 
+
+
 
 
 
 
 
-
-
+
 
 
 
-
 
 
 
@@ -736,29 +752,29 @@
 
 
 
-
-
-
 
 
 
 
-
-
-
-
 
+
+
+
 
+
 
-
-
-
-
-
-
+
+
+
+
+
 
 
 
+
+
+
+
 
 
 
@@ -779,9 +795,8 @@
 
 
 
-
-
-
+
+
 
 
 
@@ -794,20 +809,21 @@
 
 
 
-
-
-
-
 
+
 
 
-
-
+
+
+
+
+
+
+
 
 
-
 
-
+
 
 
 
@@ -822,13 +838,13 @@
 
 
 
+
+
 
 
-
-
-
-
 
+
+
 
 
 
@@ -838,8 +854,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -850,60 +866,60 @@
 
 
 
-
-
-
+
+
 
-
 
 
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
 
-
-
-
+
 
+
+
+
+
 
 
-
-
-
 
+
+
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index c98b390a..f283bae7 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -3,12 +3,12 @@
 
 
 NMVPNPlugin
-
+
 
 
 
-
-
+
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-glib Reference Manual
-Next
+Next
 
 
 Top
@@ -37,28 +37,28 @@
 

 

 
Synopsis

-
                    NMVPNPlugin;
-                    NMVPNPluginClass;
-enum                NMVPNPluginError;
-#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+
#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 #define             NM_VPN_PLUGIN_STATE
-gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);
+enum                NMVPNPluginError;
+                    NMVPNPlugin;
+                    NMVPNPluginClass;
 GQuark              nm_vpn_plugin_error_quark           (void);
-void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);
 DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
 NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
+void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);
+void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);
+void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
+                                                         NMVPNPluginFailure reason);
 void                nm_vpn_plugin_set_config            (NMVPNPlugin *plugin,
                                                          GHashTable *config);
 void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip4_config);
 void                nm_vpn_plugin_set_ip6_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip6_config);
-void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);
-void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);
+gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);
 

 

 

@@ -69,60 +69,16 @@ enum                
 
Details

 

-
NMVPNPlugin

-
typedef struct {
-	GObject parent;
-} NMVPNPlugin;
+
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

+
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 

 

 

 

 

 

-
NMVPNPluginClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* virtual methods */
-	gboolean (*connect)      (NMVPNPlugin   *plugin,
-	                          NMConnection  *connection,
-	                          GError       **err);
-
-	gboolean (*need_secrets) (NMVPNPlugin *plugin,
-	                          NMConnection *connection,
-	                          char **setting_name,
-	                          GError **error);
-
-	gboolean (*disconnect)   (NMVPNPlugin   *plugin,
-	                          GError       **err);
-
-	/* Signals */
-	void (*state_changed)  (NMVPNPlugin *plugin,
-	                        NMVPNServiceState state);
-
-	void (*ip4_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *ip4_config);
-
-	void (*login_banner)   (NMVPNPlugin *plugin,
-	                        const char *banner);
-
-	void (*failure)        (NMVPNPlugin *plugin,
-	                        NMVPNPluginFailure reason);
-
-	void (*quit)           (NMVPNPlugin *plugin);
-
-	void (*config)         (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	void (*ip6_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMVPNPluginClass;
+
NM_VPN_PLUGIN_STATE

+
#define NM_VPN_PLUGIN_STATE             "state"
 

 

 

@@ -145,8 +101,11 @@ enum                
+

+++
@@ -208,54 +167,106 @@ Returned by the VPN service plugin to indicate errors.
 

-
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

-
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
+
NMVPNPlugin

+
typedef struct {
+	GObject parent;
+} NMVPNPlugin;
 

 

 

 

-
NM_VPN_PLUGIN_STATE

-
#define NM_VPN_PLUGIN_STATE             "state"
+
NMVPNPluginClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* virtual methods */
+	gboolean (*connect)      (NMVPNPlugin   *plugin,
+	                          NMConnection  *connection,
+	                          GError       **err);
+
+	gboolean (*need_secrets) (NMVPNPlugin *plugin,
+	                          NMConnection *connection,
+	                          char **setting_name,
+	                          GError **error);
+
+	gboolean (*disconnect)   (NMVPNPlugin   *plugin,
+	                          GError       **err);
+
+	/* Signals */
+	void (*state_changed)  (NMVPNPlugin *plugin,
+	                        NMVPNServiceState state);
+
+	void (*ip4_config)     (NMVPNPlugin *plugin,
+	                        GHashTable  *ip4_config);
+
+	void (*login_banner)   (NMVPNPlugin *plugin,
+	                        const char *banner);
+
+	void (*failure)        (NMVPNPlugin *plugin,
+	                        NMVPNPluginFailure reason);
+
+	void (*quit)           (NMVPNPlugin *plugin);
+
+	void (*config)         (NMVPNPlugin *plugin,
+	                        GHashTable  *config);
+
+	void (*ip6_config)     (NMVPNPlugin *plugin,
+	                        GHashTable  *config);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMVPNPluginClass;
 

 

 

 

-
nm_vpn_plugin_disconnect ()

-
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);

+
nm_vpn_plugin_error_quark ()

+
GQuark              nm_vpn_plugin_error_quark           (void);

 

 

 

-
nm_vpn_plugin_error_quark ()

-
GQuark              nm_vpn_plugin_error_quark           (void);

+
nm_vpn_plugin_get_connection ()

+
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

 

 

 

-
nm_vpn_plugin_failure ()

-
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);

+
nm_vpn_plugin_get_state ()

+
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

 

 

 

-
nm_vpn_plugin_get_connection ()

-
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

+
nm_vpn_plugin_set_state ()

+
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);

 

 

 

-
nm_vpn_plugin_get_state ()

-
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

+
nm_vpn_plugin_set_login_banner ()

+
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);

+

+

+

+

+

+
nm_vpn_plugin_failure ()

+
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
+                                                         NMVPNPluginFailure reason);

 

 

 

@@ -285,17 +296,9 @@ Returned by the VPN service plugin to indicate errors.
 

-
nm_vpn_plugin_set_login_banner ()

-
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);

-

-

-

-

-

-
nm_vpn_plugin_set_state ()

-
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);

+
nm_vpn_plugin_disconnect ()

+
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);

 

 

 

@@ -303,6 +306,6 @@ Returned by the VPN service plugin to indicate errors.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ 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
new file mode 100644
index 00000000..fb13eb06
--- /dev/null
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
@@ -0,0 +1,388 @@
+
+
+
+
+NMVpnPluginUi
+
+
+
+
+
+
+
+
+
+

 


 
 

 
NM_VPN_PLUGIN_ERROR_GENERAL

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMVpnPluginUi

+
NMVpnPluginUi

+

+

+
Synopsis

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
+enum                NMVpnPluginUiCapability;
+#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
+#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
+#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
+enum                NMVpnPluginUiInterfaceProp;
+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,
+                                                         const char *path,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);
+char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);
+gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+struct              NMVpnPluginUiWidgetInterface;
+GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);
+gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NMVpnPluginUiFactory ()

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_factory ()

+
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

+

+

+

+

+

+
enum NMVpnPluginUiCapability

+
typedef enum {
+	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
+	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
+} NMVpnPluginUiCapability;
+

+

+Flags that indicate to UI programs certain capabilities of the plugin.
+

+

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




NM_VPN_PLUGIN_UI_CAPABILITY_NONE
unknown or no capability
+
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
the plugin can import new connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
the plugin can export connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
the plugin supports IPv6 addressing
+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_NAME

+
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
+

+

+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_DESC

+
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
+

+

+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

+
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
+

+

+

+

+

+

+
enum NMVpnPluginUiInterfaceProp

+
typedef enum {
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
+} NMVpnPluginUiInterfaceProp;
+

+

+GObject property numbers that plugins should override to provide certain
+information to UI programs.
+

+

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




NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME
the VPN plugin's name
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC
description of the VPN plugin and what
+VPN services it supports
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
the D-Bus service name used by the
+plugin's VPN service daemon
+

+

+

+

+
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);
+
+	/* Deprecated and no longer used */
+	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,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_get_capabilities ()

+
guint32             nm_vpn_plugin_ui_interface_get_capabilities
+                                                        (NMVpnPluginUiInterface *iface);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_import ()

+
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_export ()

+
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_get_suggested_name ()

+
char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_delete_connection ()

+
gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
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);
+
+	/* Deprecated and no longer used */
+	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_widget ()

+
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);

+

+

+

+

+

+
nm_vpn_plugin_ui_widget_interface_update_connection ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_widget_interface_save_secrets ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+

+

+          Generated by GTK-Doc V1.19

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

-

-

-
-
-

-
NMVpnPluginUiWidget

-
NMVpnPluginUiWidget

-

-

-
Synopsis

-
enum                NMVpnPluginUiCapability;
-NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-struct              NMVpnPluginUiInterface;
-enum                NMVpnPluginUiInterfaceProp;
-struct              NMVpnPluginUiWidgetInterface;
-#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
-#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
-#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-

-
Description

-

-

-

-

-
Details

-

-
enum NMVpnPluginUiCapability

-
typedef enum {
-	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
-	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
-} NMVpnPluginUiCapability;
-

-

-Flags that indicate to UI programs certain capabilities of the plugin.
-

-

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


NM_VPN_PLUGIN_UI_CAPABILITY_NONE
unknown or no capability
-
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
the plugin can import new connections
-
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
the plugin can export connections
-
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
the plugin supports IPv6 addressing
-

-

-

-

-
NMVpnPluginUiFactory ()

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

-

-

-

-

-

-
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);
-
-	/* Deprecated and no longer used */
-	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);
-};
-

-

-

-

-

-

-
enum NMVpnPluginUiInterfaceProp

-
typedef enum {
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
-} NMVpnPluginUiInterfaceProp;
-

-

-GObject property numbers that plugins should override to provide certain
-information to UI programs.
-

-

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


NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME
the VPN plugin's name
-
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC
description of the VPN plugin and what
-VPN services it supports
-
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
the D-Bus service name used by the
-plugin's VPN service daemon
-

-

-

-

-
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);
-
-	/* Deprecated and no longer used */
-	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_INTERFACE_DESC

-
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_INTERFACE_NAME

-
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

-
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
-

-

-

-

-

-

-
nm_vpn_plugin_ui_factory ()

-
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_delete_connection ()

-
gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_export ()

-
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_get_capabilities ()

-
guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_get_suggested_name ()

-
char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_ui_factory ()

-
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_get_widget ()

-
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_save_secrets ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_update_connection ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-

-

-          Generated by GTK-Doc V1.18

-
-
\ 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 9c4316ee..3793ddcd 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -3,12 +3,12 @@
 
 
 nm-types
-
+
 
 
 
 
-
+
 
 
 
@@ -50,6 +50,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index a473684c..5bc3027b 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -3,18 +3,18 @@
 
 
 nm-vpn-plugin-utils
-
+
 
 
-
+
 
-
+
 
 
 
 
-
+
@@ -37,14 +37,14 @@
 

 

 
Synopsis

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);
-gboolean            nm_vpn_plugin_utils_read_vpn_details
+
gboolean            nm_vpn_plugin_utils_read_vpn_details
                                                         (int fd,
                                                          GHashTable **out_data,
                                                          GHashTable **out_secrets);
+gboolean            nm_vpn_plugin_utils_get_secret_flags
+                                                        (GHashTable *data,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags);
 

 

 

@@ -55,75 +55,81 @@
 

 
Details

 

-
nm_vpn_plugin_utils_get_secret_flags ()

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);

+
nm_vpn_plugin_utils_read_vpn_details ()

+
gboolean            nm_vpn_plugin_utils_read_vpn_details
+                                                        (int fd,
+                                                         GHashTable **out_data,
+                                                         GHashTable **out_secrets);

 

-Given a VPN secret key name, attempts to find the corresponding flags data
-item in data.  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.
+Parses key/value pairs from a file descriptor (normally stdin) passed by
+an applet when the applet calls the authentication dialog of the VPN plugin.
 

-

+

+++
-
-
+
+
-
-
+
+
-
-
+
+TRUE if reading values was successful, FALSE if not

 


 
 
data :
hash table containing VPN key/value pair data items
fd :
file descriptor to read from, usually stdin (0)
 

 
secret_name :
VPN secret key name for which to retrieve flags for
out_data :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
+
 

 
out_flags :
on success, the flags associated with secret_name. [out]
+
out_secrets :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
 
 

 

 
Returns :

 
-TRUE if the flag data item was found and successfully converted
-to flags, FALSE if not
 

 
 

 

 

 

-
nm_vpn_plugin_utils_read_vpn_details ()

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);

+
nm_vpn_plugin_utils_get_secret_flags ()

+
gboolean            nm_vpn_plugin_utils_get_secret_flags
+                                                        (GHashTable *data,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags);

 

-Parses key/value pairs from a file descriptor (normally stdin) passed by
-an applet when the applet calls the authentication dialog of the VPN plugin.
+Given a VPN secret key name, attempts to find the corresponding flags data
+item in data.  If found, converts the flags data item to
+NMSettingSecretFlags and returns it.
 

-

+

+++
-
-
+
+
-
-
+
+
-
-
+
+TRUE if the flag data item was found and successfully converted
+to flags, FALSE if not

 


 
 
fd :
file descriptor to read from, usually stdin (0)
data :
hash table containing VPN key/value pair data items
 

 
out_data :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
-
secret_name :
VPN secret key name for which to retrieve flags for
 

 
out_secrets :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
+
out_flags :
on success, the flags associated with secret_name. [out]
 
 

 

 
Returns :

 
-TRUE if reading values was successful, FALSE if not
 

 
 

@@ -132,6 +138,6 @@ an applet when the applet calls the authentication dialog of the VPN plugin.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index c372ebee..e046cc04 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -31,7 +31,7 @@
       
       
       
-      
+      
       
     
     
@@ -39,54 +39,66 @@
     
   
   
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
-    
-    
-    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
+    
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
+    
     
     
     
@@ -98,25 +110,25 @@
     
     
     
-    
-    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
+    
+    
+    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
-    
     
     
     
@@ -125,57 +137,57 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
-    
-    
+    
+    
+    
     
     
-    
     
-    
+    
+    
+    
+    
     
+    
     
-    
-    
-    
+    
     
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
     
-    
     
-    
+    
+    
+    
+    
+    
     
+    
     
-    
-    
-    
+    
     
     
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
+    
     
     
     
@@ -198,45 +210,45 @@
     
     
     
-    
-    
     
-    
     
+    
     
     
     
-    
-    
+    
+    
+    
+    
     
     
     
-    
+    
     
     
     
     
-    
-    
     
-    
-    
-    
-    
     
+    
     
-    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -246,54 +258,54 @@
     
     
     
-    
-    
     
-    
     
-    
     
-    
+    
+    
+    
+    
     
+    
     
     
-    
-    
     
-    
     
+    
     
     
-    
-    
+    
+    
+    
+    
     
     
-    
+    
     
     
     
-    
-    
     
-    
-    
-    
-    
     
+    
     
+    
+    
     
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
+    
     
     
+    
     
+    
     
-    
+    
     
     
     
@@ -303,127 +315,127 @@
     
     
     
-    
-    
     
-    
     
     
-    
+    
+    
+    
     
+    
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
     
-    
     
-    
-    
+    
+    
+    
+    
     
+    
+    
     
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
-    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
-    
-    
-    
     
-    
     
-    
-    
+    
+    
+    
+    
+    
     
-    
     
-    
+    
+    
+    
     
     
     
-    
-    
-    
     
-    
-    
-    
-    
+    
     
     
+    
+    
+    
+    
     
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
+    
     
     
+    
+    
+    
+    
     
-    
-    
+    
+    
+    
     
     
     
@@ -437,16 +449,16 @@
     
     
     
-    
     
+    
     
     
+    
     
-    
     
+    
     
     
-    
     
     
     
@@ -455,14 +467,14 @@
     
     
     
-    
     
+    
     
+    
     
-    
     
+    
     
-    
     
     
     
@@ -470,66 +482,66 @@
     
     
     
-    
-    
     
+    
+    
     
     
     
     
-    
-    
     
+    
+    
     
-    
-    
     
-    
-    
     
     
+    
+    
+    
+    
     
     
     
     
     
+    
+    
     
     
     
     
     
-    
-    
+    
     
     
     
-    
     
     
     
     
     
     
-    
-    
-    
     
-    
-    
-    
-    
     
+    
+    
+    
     
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
     
     
+    
+    
+    
+    
     
     
     
@@ -537,74 +549,74 @@
     
     
     
-    
-    
-    
+    
+    
     
     
-    
-    
-    
-    
     
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
+    
     
     
     
     
+    
+    
     
     
-    
-    
-    
-    
     
+    
+    
     
     
     
-    
-    
-    
     
     
-    
+    
+    
+    
     
-    
     
     
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
     
@@ -673,6 +685,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -697,12 +713,12 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 0488f18b..e001e47a 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -3,12 +3,12 @@
 
 
 Object Hierarchy
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-Object Hierarchy

+

+Object Hierarchy

 
     GObject
         NMObject
@@ -54,6 +54,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index db83e194..6dd6954c 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -3,12 +3,12 @@
 
 
 Object Overview
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-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,
@@ -42,6 +42,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index a8216584..ea71d9d2 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -1,36 +1,31 @@
-

-libnm_glib
-
-

-
 

 nm-access-point
 NMAccessPoint
-NMAccessPoint
-NMAccessPointClass
-NM_ACCESS_POINT_BSSID
 NM_ACCESS_POINT_FLAGS
-NM_ACCESS_POINT_FREQUENCY
-NM_ACCESS_POINT_HW_ADDRESS
-NM_ACCESS_POINT_MAX_BITRATE
-NM_ACCESS_POINT_MODE
+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_WPA_FLAGS
-nm_access_point_connection_valid
-nm_access_point_filter_connections
-nm_access_point_get_bssid
+NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
+NMAccessPointClass
+nm_access_point_new
 nm_access_point_get_flags
-nm_access_point_get_frequency
-nm_access_point_get_hw_address
-nm_access_point_get_max_bitrate
-nm_access_point_get_mode
+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_get_wpa_flags
-nm_access_point_new
+nm_access_point_filter_connections
+nm_access_point_connection_valid
+nm_access_point_get_hw_address
 
 NM_ACCESS_POINT
 NM_ACCESS_POINT_CLASS
@@ -44,25 +39,25 @@ nm_access_point_get_type
 

 nm-active-connection
 NMActiveConnection
-NMActiveConnection
-NMActiveConnectionClass
 NM_ACTIVE_CONNECTION_CONNECTION
+NM_ACTIVE_CONNECTION_UUID
+NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
+NM_ACTIVE_CONNECTION_DEVICES
+NM_ACTIVE_CONNECTION_STATE
 NM_ACTIVE_CONNECTION_DEFAULT
 NM_ACTIVE_CONNECTION_DEFAULT6
-NM_ACTIVE_CONNECTION_DEVICES
 NM_ACTIVE_CONNECTION_MASTER
-NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-NM_ACTIVE_CONNECTION_STATE
-NM_ACTIVE_CONNECTION_UUID
+NMActiveConnection
+NMActiveConnectionClass
+nm_active_connection_new
 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
 nm_active_connection_get_default
 nm_active_connection_get_default6
-nm_active_connection_get_devices
 nm_active_connection_get_master
-nm_active_connection_get_specific_object
-nm_active_connection_get_state
-nm_active_connection_get_uuid
-nm_active_connection_new
 
 NM_ACTIVE_CONNECTION
 NM_ACTIVE_CONNECTION_CLASS
@@ -76,51 +71,60 @@ nm_active_connection_get_type
 

 nm-client
 NMClient
-NMClient
-NMClientActivateFn
-NMClientAddActivateFn
-NMClientClass
-NMClientPermission
-NMClientPermissionResult
-NM_CLIENT_ACTIVE_CONNECTIONS
+NM_CLIENT_VERSION
+NM_CLIENT_STATE
 NM_CLIENT_MANAGER_RUNNING
 NM_CLIENT_NETWORKING_ENABLED
-NM_CLIENT_STATE
-NM_CLIENT_VERSION
-NM_CLIENT_WIMAX_ENABLED
-NM_CLIENT_WIMAX_HARDWARE_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
+NM_CLIENT_CONNECTIVITY
+NM_CLIENT_PRIMARY_CONNECTION
+NM_CLIENT_ACTIVATING_CONNECTION
+NMClientPermission
+NMClientPermissionResult
+NMClient
+NMClientClass
+nm_client_new
+nm_client_new_async
+nm_client_new_finish
+nm_client_get_devices
+nm_client_get_device_by_path
+nm_client_get_device_by_iface
+NMClientActivateFn
 nm_client_activate_connection
+NMClientAddActivateFn
 nm_client_add_and_activate_connection
 nm_client_deactivate_connection
-nm_client_get_active_connections
-nm_client_get_device_by_iface
-nm_client_get_device_by_path
-nm_client_get_devices
-nm_client_get_logging
-nm_client_get_manager_running
-nm_client_get_permission_result
-nm_client_get_state
-nm_client_get_version
 nm_client_networking_get_enabled
 nm_client_networking_set_enabled
-nm_client_new
-nm_client_new_async
-nm_client_new_finish
-nm_client_set_logging
-nm_client_sleep
-nm_client_wimax_get_enabled
-nm_client_wimax_hardware_get_enabled
-nm_client_wimax_set_enabled
 nm_client_wireless_get_enabled
-nm_client_wireless_hardware_get_enabled
 nm_client_wireless_set_enabled
+nm_client_wireless_hardware_get_enabled
 nm_client_wwan_get_enabled
-nm_client_wwan_hardware_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_get_logging
+nm_client_set_logging
+nm_client_get_connectivity
+nm_client_check_connectivity
+nm_client_check_connectivity_async
+nm_client_check_connectivity_finish
+nm_client_get_primary_connection
+nm_client_get_activating_connection
 
 NM_CLIENT
 NM_CLIENT_CLASS
@@ -134,57 +138,57 @@ nm_client_get_type
 

 nm-device
 NMDevice
-NMDevice
-NMDeviceClass
-NMDeviceDeactivateFn
-NM_DEVICE_ACTIVE_CONNECTION
-NM_DEVICE_AUTOCONNECT
-NM_DEVICE_AVAILABLE_CONNECTIONS
-NM_DEVICE_CAPABILITIES
 NM_DEVICE_DEVICE_TYPE
-NM_DEVICE_DHCP4_CONFIG
-NM_DEVICE_DHCP6_CONFIG
+NM_DEVICE_UDI
+NM_DEVICE_INTERFACE
+NM_DEVICE_IP_INTERFACE
 NM_DEVICE_DRIVER
 NM_DEVICE_DRIVER_VERSION
-NM_DEVICE_FIRMWARE_MISSING
 NM_DEVICE_FIRMWARE_VERSION
-NM_DEVICE_INTERFACE
+NM_DEVICE_CAPABILITIES
+NM_DEVICE_MANAGED
+NM_DEVICE_AUTOCONNECT
+NM_DEVICE_FIRMWARE_MISSING
 NM_DEVICE_IP4_CONFIG
+NM_DEVICE_DHCP4_CONFIG
 NM_DEVICE_IP6_CONFIG
-NM_DEVICE_IP_INTERFACE
-NM_DEVICE_MANAGED
-NM_DEVICE_PRODUCT
+NM_DEVICE_DHCP6_CONFIG
 NM_DEVICE_STATE
 NM_DEVICE_STATE_REASON
-NM_DEVICE_UDI
+NM_DEVICE_ACTIVE_CONNECTION
+NM_DEVICE_AVAILABLE_CONNECTIONS
 NM_DEVICE_VENDOR
-nm_device_connection_compatible
-nm_device_connection_valid
-nm_device_disconnect
-nm_device_filter_connections
-nm_device_get_active_connection
-nm_device_get_autoconnect
-nm_device_get_available_connections
-nm_device_get_capabilities
+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_dhcp4_config
-nm_device_get_dhcp6_config
+nm_device_get_udi
 nm_device_get_driver
 nm_device_get_driver_version
-nm_device_get_firmware_missing
 nm_device_get_firmware_version
-nm_device_get_iface
+nm_device_get_capabilities
+nm_device_get_managed
+nm_device_get_autoconnect
+nm_device_set_autoconnect
+nm_device_get_firmware_missing
 nm_device_get_ip4_config
+nm_device_get_dhcp4_config
 nm_device_get_ip6_config
-nm_device_get_ip_iface
-nm_device_get_managed
-nm_device_get_product
+nm_device_get_dhcp6_config
 nm_device_get_state
 nm_device_get_state_reason
-nm_device_get_udi
+nm_device_get_active_connection
+nm_device_get_available_connections
+nm_device_get_product
 nm_device_get_vendor
-nm_device_new
-nm_device_set_autoconnect
+NMDeviceDeactivateFn
+nm_device_disconnect
+nm_device_filter_connections
+nm_device_connection_valid
+nm_device_connection_compatible
 
 NM_DEVICE
 NM_DEVICE_CLASS
@@ -198,14 +202,14 @@ nm_device_get_type
 

 nm-device-adsl
 NMDeviceAdsl
-NMDeviceAdsl
-NMDeviceAdslClass
 NMDeviceAdslError
-NM_DEVICE_ADSL_CARRIER
 NM_DEVICE_ADSL_ERROR
 nm_device_adsl_error_quark
-nm_device_adsl_get_carrier
+NM_DEVICE_ADSL_CARRIER
+NMDeviceAdsl
+NMDeviceAdslClass
 nm_device_adsl_new
+nm_device_adsl_get_carrier
 
 NM_DEVICE_ADSL
 NM_DEVICE_ADSL_CLASS
@@ -219,18 +223,18 @@ nm_device_adsl_get_type
 

 nm-device-bond
 NMDeviceBond
-NMDeviceBond
-NMDeviceBondClass
 NMDeviceBondError
-NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_ERROR
+nm_device_bond_error_quark
 NM_DEVICE_BOND_HW_ADDRESS
+NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_SLAVES
-nm_device_bond_error_quark
-nm_device_bond_get_carrier
+NMDeviceBond
+NMDeviceBondClass
+nm_device_bond_new
 nm_device_bond_get_hw_address
+nm_device_bond_get_carrier
 nm_device_bond_get_slaves
-nm_device_bond_new
 
 NM_DEVICE_BOND
 NM_DEVICE_BOND_CLASS
@@ -244,18 +248,18 @@ nm_device_bond_get_type
 

 nm-device-bridge
 NMDeviceBridge
-NMDeviceBridge
-NMDeviceBridgeClass
 NMDeviceBridgeError
-NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_ERROR
+nm_device_bridge_error_quark
 NM_DEVICE_BRIDGE_HW_ADDRESS
+NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_SLAVES
-nm_device_bridge_error_quark
-nm_device_bridge_get_carrier
+NMDeviceBridge
+NMDeviceBridgeClass
+nm_device_bridge_new
 nm_device_bridge_get_hw_address
+nm_device_bridge_get_carrier
 nm_device_bridge_get_slaves
-nm_device_bridge_new
 
 NM_DEVICE_BRIDGE
 NM_DEVICE_BRIDGE_CLASS
@@ -269,18 +273,18 @@ nm_device_bridge_get_type
 

 nm-device-bt
 NMDeviceBt
-NMDeviceBt
-NMDeviceBtClass
 NMDeviceBtError
-NM_DEVICE_BT_CAPABILITIES
 NM_DEVICE_BT_ERROR
+nm_device_bt_error_quark
 NM_DEVICE_BT_HW_ADDRESS
 NM_DEVICE_BT_NAME
-nm_device_bt_error_quark
-nm_device_bt_get_capabilities
+NM_DEVICE_BT_CAPABILITIES
+NMDeviceBt
+NMDeviceBtClass
+nm_device_bt_new
 nm_device_bt_get_hw_address
 nm_device_bt_get_name
-nm_device_bt_new
+nm_device_bt_get_capabilities
 
 NM_DEVICE_BT
 NM_DEVICE_BT_CLASS
@@ -294,20 +298,20 @@ nm_device_bt_get_type
 

 nm-device-ethernet
 NMDeviceEthernet
-NMDeviceEthernet
-NMDeviceEthernetClass
 NMDeviceEthernetError
-NM_DEVICE_ETHERNET_CARRIER
 NM_DEVICE_ETHERNET_ERROR
+nm_device_ethernet_error_quark
 NM_DEVICE_ETHERNET_HW_ADDRESS
 NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 NM_DEVICE_ETHERNET_SPEED
-nm_device_ethernet_error_quark
-nm_device_ethernet_get_carrier
+NM_DEVICE_ETHERNET_CARRIER
+NMDeviceEthernet
+NMDeviceEthernetClass
+nm_device_ethernet_new
 nm_device_ethernet_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
 nm_device_ethernet_get_speed
-nm_device_ethernet_new
+nm_device_ethernet_get_carrier
 
 NM_DEVICE_ETHERNET
 NM_DEVICE_ETHERNET_CLASS
@@ -321,16 +325,16 @@ nm_device_ethernet_get_type
 

 nm-device-infiniband
 NMDeviceInfiniband
-NMDeviceInfiniband
-NMDeviceInfinibandClass
 NMDeviceInfinibandError
-NM_DEVICE_INFINIBAND_CARRIER
 NM_DEVICE_INFINIBAND_ERROR
-NM_DEVICE_INFINIBAND_HW_ADDRESS
 nm_device_infiniband_error_quark
-nm_device_infiniband_get_carrier
-nm_device_infiniband_get_hw_address
+NM_DEVICE_INFINIBAND_HW_ADDRESS
+NM_DEVICE_INFINIBAND_CARRIER
+NMDeviceInfiniband
+NMDeviceInfinibandClass
 nm_device_infiniband_new
+nm_device_infiniband_get_hw_address
+nm_device_infiniband_get_carrier
 
 NM_DEVICE_INFINIBAND
 NM_DEVICE_INFINIBAND_CLASS
@@ -344,15 +348,15 @@ nm_device_infiniband_get_type
 

 nm-device-modem
 NMDeviceModem
-NMDeviceModem
-NMDeviceModemClass
 NMDeviceModemError
-NM_DEVICE_MODEM_CURRENT_CAPABILITIES
 NM_DEVICE_MODEM_ERROR
-NM_DEVICE_MODEM_MODEM_CAPABILITIES
 nm_device_modem_error_quark
-nm_device_modem_get_current_capabilities
+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_DEVICE_MODEM
 NM_DEVICE_MODEM_CLASS
@@ -366,18 +370,18 @@ nm_device_modem_get_type
 

 nm-device-olpc-mesh
 NMDeviceOlpcMesh
-NMDeviceOlpcMesh
-NMDeviceOlpcMeshClass
 NMDeviceOlpcMeshError
-NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-NM_DEVICE_OLPC_MESH_COMPANION
 NM_DEVICE_OLPC_MESH_ERROR
-NM_DEVICE_OLPC_MESH_HW_ADDRESS
 nm_device_olpc_mesh_error_quark
-nm_device_olpc_mesh_get_active_channel
-nm_device_olpc_mesh_get_companion
-nm_device_olpc_mesh_get_hw_address
+NM_DEVICE_OLPC_MESH_HW_ADDRESS
+NM_DEVICE_OLPC_MESH_COMPANION
+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+NMDeviceOlpcMesh
+NMDeviceOlpcMeshClass
 nm_device_olpc_mesh_new
+nm_device_olpc_mesh_get_hw_address
+nm_device_olpc_mesh_get_companion
+nm_device_olpc_mesh_get_active_channel
 
 NM_DEVICE_OLPC_MESH
 NM_DEVICE_OLPC_MESH_CLASS
@@ -391,18 +395,18 @@ nm_device_olpc_mesh_get_type
 

 nm-device-vlan
 NMDeviceVlan
-NMDeviceVlan
-NMDeviceVlanClass
 NMDeviceVlanError
-NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_ERROR
+nm_device_vlan_error_quark
 NM_DEVICE_VLAN_HW_ADDRESS
+NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_VLAN_ID
-nm_device_vlan_error_quark
-nm_device_vlan_get_carrier
+NMDeviceVlan
+NMDeviceVlanClass
+nm_device_vlan_new
 nm_device_vlan_get_hw_address
+nm_device_vlan_get_carrier
 nm_device_vlan_get_vlan_id
-nm_device_vlan_new
 
 NM_DEVICE_VLAN
 NM_DEVICE_VLAN_CLASS
@@ -416,27 +420,27 @@ nm_device_vlan_get_type
 

 nm-device-wifi
 NMDeviceWifi
-NMDeviceWifi
-NMDeviceWifiClass
 NMDeviceWifiError
-NMDeviceWifiRequestScanFn
-NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
-NM_DEVICE_WIFI_BITRATE
-NM_DEVICE_WIFI_CAPABILITIES
 NM_DEVICE_WIFI_ERROR
+nm_device_wifi_error_quark
 NM_DEVICE_WIFI_HW_ADDRESS
-NM_DEVICE_WIFI_MODE
 NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-nm_device_wifi_error_quark
-nm_device_wifi_get_access_point_by_path
-nm_device_wifi_get_access_points
-nm_device_wifi_get_active_access_point
-nm_device_wifi_get_bitrate
-nm_device_wifi_get_capabilities
+NM_DEVICE_WIFI_MODE
+NM_DEVICE_WIFI_BITRATE
+NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
+NM_DEVICE_WIFI_CAPABILITIES
+NMDeviceWifi
+NMDeviceWifiClass
+nm_device_wifi_new
 nm_device_wifi_get_hw_address
-nm_device_wifi_get_mode
 nm_device_wifi_get_permanent_hw_address
-nm_device_wifi_new
+nm_device_wifi_get_mode
+nm_device_wifi_get_bitrate
+nm_device_wifi_get_capabilities
+nm_device_wifi_get_active_access_point
+nm_device_wifi_get_access_point_by_path
+nm_device_wifi_get_access_points
+NMDeviceWifiRequestScanFn
 nm_device_wifi_request_scan_simple
 
 NM_DEVICE_WIFI
@@ -451,28 +455,28 @@ nm_device_wifi_get_type
 

 nm-device-wimax
 NMDeviceWimax
-NMDeviceWimax
-NMDeviceWimaxClass
 NMDeviceWimaxError
-NM_DEVICE_WIMAX_ACTIVE_NSP
-NM_DEVICE_WIMAX_BSID
-NM_DEVICE_WIMAX_CENTER_FREQUENCY
-NM_DEVICE_WIMAX_CINR
 NM_DEVICE_WIMAX_ERROR
+nm_device_wimax_error_quark
 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_error_quark
-nm_device_wimax_get_active_nsp
-nm_device_wimax_get_bsid
-nm_device_wimax_get_center_frequency
-nm_device_wimax_get_cinr
+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_new
+nm_device_wimax_get_bsid
 
 NM_DEVICE_WIMAX
 NM_DEVICE_WIMAX_CLASS
@@ -489,9 +493,9 @@ nm_device_wimax_get_type
 NMDHCP4Config
 NMDHCP4ConfigClass
 NM_DHCP4_CONFIG_OPTIONS
-nm_dhcp4_config_get_one_option
-nm_dhcp4_config_get_options
 nm_dhcp4_config_new
+nm_dhcp4_config_get_options
+nm_dhcp4_config_get_one_option
 
 NM_DHCP4_CONFIG
 NM_DHCP4_CONFIG_CLASS
@@ -507,9 +511,9 @@ nm_dhcp4_config_get_type
 NMDHCP6Config
 NMDHCP6ConfigClass
 NM_DHCP6_CONFIG_OPTIONS
-nm_dhcp6_config_get_one_option
-nm_dhcp6_config_get_options
 nm_dhcp6_config_new
+nm_dhcp6_config_get_options
+nm_dhcp6_config_get_one_option
 
 NM_DHCP6_CONFIG
 NM_DHCP6_CONFIG_CLASS
@@ -560,27 +564,22 @@ nm_secret_agent_get_secrets_flags_get_type
 nm_wimax_nsp_network_type_get_type
 

 
-

-nm-glib-marshal
-
-

-
 

 nm-ip4-config
 NMIP4Config
 NMIP4Config
 NMIP4ConfigClass
 NM_IP4_CONFIG_ADDRESSES
-NM_IP4_CONFIG_DOMAINS
 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_domains
 nm_ip4_config_get_nameservers
+nm_ip4_config_get_domains
 nm_ip4_config_get_routes
 nm_ip4_config_get_wins_servers
-nm_ip4_config_new
 
 NM_IP4_CONFIG
 NM_IP4_CONFIG_CLASS
@@ -597,14 +596,14 @@ nm_ip4_config_get_type
 NMIP6Config
 NMIP6ConfigClass
 NM_IP6_CONFIG_ADDRESSES
-NM_IP6_CONFIG_DOMAINS
 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_domains
 nm_ip6_config_get_nameservers
+nm_ip6_config_get_domains
 nm_ip6_config_get_routes
-nm_ip6_config_new
 
 NM_IP6_CONFIG
 NM_IP6_CONFIG_CLASS
@@ -618,13 +617,13 @@ nm_ip6_config_get_type
 

 nm-object
 NMObject
-NMObject
-NMObjectClass
 NMObjectError
-NM_OBJECT_DBUS_CONNECTION
-NM_OBJECT_DBUS_PATH
 NM_OBJECT_ERROR
 nm_object_error_quark
+NM_OBJECT_DBUS_CONNECTION
+NM_OBJECT_DBUS_PATH
+NMObject
+NMObjectClass
 nm_object_get_connection
 nm_object_get_path
 
@@ -640,17 +639,17 @@ nm_object_get_type
 

 nm-remote-connection
 NMRemoteConnection
+NM_REMOTE_CONNECTION_UPDATED
+NM_REMOTE_CONNECTION_REMOVED
 NMRemoteConnection
 NMRemoteConnectionClass
 NMRemoteConnectionCommitFunc
 NMRemoteConnectionDeleteFunc
 NMRemoteConnectionGetSecretsFunc
-NM_REMOTE_CONNECTION_REMOVED
-NM_REMOTE_CONNECTION_UPDATED
+nm_remote_connection_new
 nm_remote_connection_commit_changes
 nm_remote_connection_delete
 nm_remote_connection_get_secrets
-nm_remote_connection_new
 
 NM_IS_REMOTE_CONNECTION
 NM_IS_REMOTE_CONNECTION_CLASS
@@ -664,26 +663,26 @@ nm_remote_connection_get_type
 

 nm-remote-settings
 NMRemoteSettings
-NMRemoteSettings
-NMRemoteSettingsAddConnectionFunc
-NMRemoteSettingsClass
 NMRemoteSettingsError
-NMRemoteSettingsSaveHostnameFunc
-NM_REMOTE_SETTINGS_BUS
-NM_REMOTE_SETTINGS_CAN_MODIFY
-NM_REMOTE_SETTINGS_CONNECTIONS_READ
 NM_REMOTE_SETTINGS_ERROR
+nm_remote_settings_error_quark
+NM_REMOTE_SETTINGS_BUS
+NM_REMOTE_SETTINGS_SERVICE_RUNNING
 NM_REMOTE_SETTINGS_HOSTNAME
+NM_REMOTE_SETTINGS_CAN_MODIFY
 NM_REMOTE_SETTINGS_NEW_CONNECTION
-NM_REMOTE_SETTINGS_SERVICE_RUNNING
-nm_remote_settings_add_connection
-nm_remote_settings_error_quark
-nm_remote_settings_get_connection_by_path
-nm_remote_settings_get_connection_by_uuid
-nm_remote_settings_list_connections
+NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NMRemoteSettingsAddConnectionFunc
+NMRemoteSettingsSaveHostnameFunc
+NMRemoteSettings
+NMRemoteSettingsClass
 nm_remote_settings_new
 nm_remote_settings_new_async
 nm_remote_settings_new_finish
+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_IS_REMOTE_SETTINGS
@@ -698,25 +697,25 @@ nm_remote_settings_get_type
 

 nm-secret-agent
 NMSecretAgent
-NMSecretAgent
-NMSecretAgentClass
-NMSecretAgentDeleteSecretsFunc
+NM_SECRET_AGENT_ERROR
+nm_secret_agent_error_quark
 NMSecretAgentError
 NMSecretAgentGetSecretsFlags
-NMSecretAgentGetSecretsFunc
-NMSecretAgentSaveSecretsFunc
-NM_SECRET_AGENT_AUTO_REGISTER
-NM_SECRET_AGENT_ERROR
 NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_AUTO_REGISTER
 NM_SECRET_AGENT_REGISTERED
 NM_SECRET_AGENT_REGISTRATION_RESULT
-nm_secret_agent_delete_secrets
-nm_secret_agent_error_quark
+NMSecretAgent
+NMSecretAgentGetSecretsFunc
+NMSecretAgentSaveSecretsFunc
+NMSecretAgentDeleteSecretsFunc
+NMSecretAgentClass
+nm_secret_agent_register
+nm_secret_agent_unregister
 nm_secret_agent_get_registered
 nm_secret_agent_get_secrets
-nm_secret_agent_register
 nm_secret_agent_save_secrets
-nm_secret_agent_unregister
+nm_secret_agent_delete_secrets
 
 NM_IS_SECRET_AGENT
 NM_IS_SECRET_AGENT_CLASS
@@ -749,13 +748,13 @@ nm_uint_array_get_type
 

 nm-vpn-connection
 NMVPNConnection
+NM_VPN_CONNECTION_VPN_STATE
+NM_VPN_CONNECTION_BANNER
 NMVPNConnection
 NMVPNConnectionClass
-NM_VPN_CONNECTION_BANNER
-NM_VPN_CONNECTION_VPN_STATE
-nm_vpn_connection_get_banner
-nm_vpn_connection_get_vpn_state
 nm_vpn_connection_new
+nm_vpn_connection_get_vpn_state
+nm_vpn_connection_get_banner
 
 NM_IS_VPN_CONNECTION
 NM_IS_VPN_CONNECTION_CLASS
@@ -780,21 +779,21 @@ nm_vpn_plugin_ui_interface_prop_get_type
 

 nm-vpn-plugin
 NMVPNPlugin
-NMVPNPlugin
-NMVPNPluginClass
-NMVPNPluginError
 NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 NM_VPN_PLUGIN_STATE
-nm_vpn_plugin_disconnect
+NMVPNPluginError
+NMVPNPlugin
+NMVPNPluginClass
 nm_vpn_plugin_error_quark
-nm_vpn_plugin_failure
 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_config
 nm_vpn_plugin_set_ip4_config
 nm_vpn_plugin_set_ip6_config
-nm_vpn_plugin_set_login_banner
-nm_vpn_plugin_set_state
+nm_vpn_plugin_disconnect
 
 NM_IS_VPN_PLUGIN
 NM_IS_VPN_PLUGIN_CLASS
@@ -809,26 +808,26 @@ nm_vpn_plugin_get_type
 
 

 nm-vpn-plugin-ui-interface
-NMVpnPluginUi
 NMVpnPluginUiWidget
-NMVpnPluginUiCapability
+NMVpnPluginUi
 NMVpnPluginUiFactory
-NMVpnPluginUiInterface
-NMVpnPluginUiInterfaceProp
-NMVpnPluginUiWidgetInterface
-NM_VPN_PLUGIN_UI_INTERFACE_DESC
+nm_vpn_plugin_ui_factory
+NMVpnPluginUiCapability
 NM_VPN_PLUGIN_UI_INTERFACE_NAME
+NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-nm_vpn_plugin_ui_factory
-nm_vpn_plugin_ui_interface_delete_connection
-nm_vpn_plugin_ui_interface_export
+NMVpnPluginUiInterfaceProp
+NMVpnPluginUiInterface
+nm_vpn_plugin_ui_interface_ui_factory
 nm_vpn_plugin_ui_interface_get_capabilities
-nm_vpn_plugin_ui_interface_get_suggested_name
 nm_vpn_plugin_ui_interface_import
-nm_vpn_plugin_ui_interface_ui_factory
+nm_vpn_plugin_ui_interface_export
+nm_vpn_plugin_ui_interface_get_suggested_name
+nm_vpn_plugin_ui_interface_delete_connection
+NMVpnPluginUiWidgetInterface
 nm_vpn_plugin_ui_widget_interface_get_widget
-nm_vpn_plugin_ui_widget_interface_save_secrets
 nm_vpn_plugin_ui_widget_interface_update_connection
+nm_vpn_plugin_ui_widget_interface_save_secrets
 
 NM_IS_VPN_PLUGIN_UI_INTERFACE
 NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
@@ -844,25 +843,25 @@ nm_vpn_plugin_ui_widget_interface_get_type
 
 

 nm-vpn-plugin-utils
-nm_vpn_plugin_utils_get_secret_flags
 nm_vpn_plugin_utils_read_vpn_details
+nm_vpn_plugin_utils_get_secret_flags
 

 
 

 nm-wimax-nsp
 NMWimaxNsp
-NMWimaxNsp
-NMWimaxNspClass
-NMWimaxNspNetworkType
 NM_WIMAX_NSP_NAME
-NM_WIMAX_NSP_NETWORK_TYPE
 NM_WIMAX_NSP_SIGNAL_QUALITY
-nm_wimax_nsp_connection_valid
-nm_wimax_nsp_filter_connections
+NM_WIMAX_NSP_NETWORK_TYPE
+NMWimaxNspNetworkType
+NMWimaxNsp
+NMWimaxNspClass
+nm_wimax_nsp_new
 nm_wimax_nsp_get_name
-nm_wimax_nsp_get_network_type
 nm_wimax_nsp_get_signal_quality
-nm_wimax_nsp_new
+nm_wimax_nsp_get_network_type
+nm_wimax_nsp_filter_connections
+nm_wimax_nsp_connection_valid
 
 NM_IS_WIMAX_NSP
 NM_IS_WIMAX_NSP_CLASS
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
deleted file mode 100644
index ed0710b9..00000000
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-libnm_glib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index 41cade52..ad78146c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -22,166 +22,165 @@ NMAccessPoint
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
-@ap: 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -190,7 +189,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -199,7 +198,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -208,7 +207,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -217,7 +216,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -235,7 +234,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -244,7 +243,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -253,31 +252,32 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@ap: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 40528ae9..56f51c6e 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -22,131 +22,132 @@ NMActiveConnection
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -155,7 +156,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -164,7 +165,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -173,7 +174,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -182,7 +183,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -191,7 +192,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -200,7 +201,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -209,13 +210,12 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@path: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index c3443c40..2c439d61 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -22,130 +22,103 @@ NMClient
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@client: 
-@active_connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@client: 
-@connection: 
-@new_connection_path: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@parent: 
-@device_added: 
-@device_removed: 
-@permission_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+
 
 
 
@@ -176,81 +149,190 @@ NMClient
 @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: 
+@permission_changed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
+
+
+
+
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@result: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@object_path: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@iface: 
+@Returns: 
+
+
+
 
 
 
 
+@client: 
+@active_connection: 
+@error: 
+@user_data: 
 
 
 
@@ -266,6 +348,18 @@ NMClient
 @user_data: 
 
 
+
+
+
+
+
+@client: 
+@connection: 
+@new_connection_path: 
+@error: 
+@user_data: 
+
+
 
 
 
@@ -288,7 +382,7 @@ NMClient
 @active: 
 
 
-
+
 
 
 
@@ -297,48 +391,43 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@iface: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@object_path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@level: 
-@domains: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -347,17 +436,16 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@permission: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
@@ -366,7 +454,7 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
@@ -375,62 +463,57 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@client: 
 @Returns: 
 
 
-
+
 
 
 
 
-@cancellable: 
-@callback: 
-@user_data: 
+@client: 
+@Returns: 
 
 
-
+
 
 
 
 
-@result: 
-@error: 
+@client: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@level: 
-@domains: 
-@error: 
 @Returns: 
 
 
@@ -443,34 +526,41 @@ NMClient
 @sleep_: 
 
 
-
+
 
 
 
 
 @client: 
+@permission: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
+@level: 
+@domains: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@level: 
+@domains: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
@@ -479,34 +569,40 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
+@cancellable: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@cancellable: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
 @client: 
+@result: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -515,12 +611,12 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 286f2f41..111cf8a6 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -22,38 +22,30 @@ NMDeviceAdsl
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
+@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
+@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
 
-
+
 
 
 
 
-
-
 
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
+
 
 
 
 
-@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
-@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
-@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
+@void: 
+@Returns: 
+
 
 
 
@@ -62,38 +54,46 @@ NMDeviceAdsl
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index 29c46c9a..cc85389d 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -22,49 +22,38 @@ NMDeviceBond
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BOND_ERROR_UNKNOWN: 
+@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
+@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
+@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_BOND_ERROR_UNKNOWN: 
-@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -73,42 +62,54 @@ NMDeviceBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -121,7 +122,7 @@ NMDeviceBond
 @Returns: 
 
 
-
+
 
 
 
@@ -130,13 +131,12 @@ NMDeviceBond
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
index 9d20554e..3570bae3 100644
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -22,49 +22,38 @@ NMDeviceBridge
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
+@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
-@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -73,42 +62,54 @@ NMDeviceBridge
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -121,7 +122,7 @@ NMDeviceBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -130,13 +131,12 @@ NMDeviceBridge
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index e0b17425..404ec888 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -22,51 +22,47 @@ NMDeviceBt
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BT_ERROR_UNKNOWN: 
+@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
+@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
+@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
+@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+@void: 
+@Returns: 
+
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_BT_ERROR_UNKNOWN: 
-@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
+
 
 
 
@@ -75,42 +71,47 @@ NMDeviceBt
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -132,13 +133,12 @@ NMDeviceBt
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index 3f5735b5..a3771275 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -22,106 +22,107 @@ NMDeviceEthernet
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
+@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
+@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
+@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
-@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -152,13 +153,12 @@ NMDeviceEthernet
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index 94ad7b90..f50d415f 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -22,45 +22,39 @@ NMDeviceInfiniband
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
+@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
+@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
+@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
-@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
+
 
 
 
@@ -69,35 +63,42 @@ NMDeviceInfiniband
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -110,13 +111,12 @@ NMDeviceInfiniband
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index e41c07ec..4e1cc83a 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -22,44 +22,38 @@ NMDeviceModem
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
+@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
+@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
+@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
-@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
+
 
 
 
@@ -68,30 +62,36 @@ NMDeviceModem
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
@@ -100,7 +100,7 @@ NMDeviceModem
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index 20c63328..fb78ba35 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -22,48 +22,44 @@ NMDeviceOlpcMesh
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
+@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
+@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+@void: 
+@Returns: 
+
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
-@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
+
 
 
 
@@ -72,46 +68,51 @@ NMDeviceOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -120,7 +121,7 @@ NMDeviceOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
@@ -129,13 +130,12 @@ NMDeviceOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 30d839e0..3ac5830f 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -22,50 +22,39 @@ NMDeviceVlan
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
+@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
+@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
+@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
+@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
-@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -74,42 +63,54 @@ NMDeviceVlan
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -122,7 +123,7 @@ NMDeviceVlan
 @Returns: 
 
 
-
+
 
 
 
@@ -131,13 +132,12 @@ NMDeviceVlan
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 3b5def39..094344b8 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -22,165 +22,164 @@ NMDeviceWifi
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
+@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
+@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
+@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
+@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
+@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
 
-
+
 
 
 
 
-@nmdevicewifi: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmdevicewifi: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@access_point_added: 
-@access_point_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
-@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
 
-
+
+
 
 
 
 
-@device: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@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: 
 
-
-
+
 
 
 
 
-@void: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -189,7 +188,7 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
@@ -216,7 +215,7 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
@@ -225,16 +224,17 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -243,14 +243,14 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
-@Returns: 
+@device: 
+@error: 
+@user_data: 
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index d23d0231..23d89281 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -22,84 +22,69 @@ NMDeviceWimax
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
+@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
+@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
+@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-@nmdevicewimax: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmdevicewimax: the object which received the signal.
-@arg1: 
-
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@nsp_added: 
-@nsp_removed: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
-@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
 
-
+
+
 
 
 
@@ -113,94 +98,111 @@ NMDeviceWimax
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmdevicewimax: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+@nmdevicewimax: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
+
+
 
+@parent: 
+@nsp_added: 
+@nsp_removed: 
 
-
+
 
 
 
 
-@wimax: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -209,26 +211,25 @@ NMDeviceWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@wimax: 
-@path: 
+@self: 
 @Returns: 
 
 
-
+
 
 
 
 
-@wimax: 
+@self: 
 @Returns: 
 
 
-
+
 
 
 
@@ -246,13 +247,12 @@ NMDeviceWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@self: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index d61ff355..7d783dc0 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -22,341 +22,336 @@ NMDevice
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@state_changed: 
-@connection_compatible: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@device: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmdevice: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@state_changed: 
+@connection_compatible: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
+@connection: 
+@path: 
+@Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connection: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@callback: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -365,7 +360,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -374,7 +369,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -392,7 +387,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -401,7 +396,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -410,16 +405,16 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@Returns: 
+@autoconnect: 
 
 
-
+
 
 
 
@@ -428,7 +423,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -437,7 +432,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -446,7 +441,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -455,7 +450,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -464,7 +459,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -473,16 +468,17 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
+@reason: 
 @Returns: 
 
 
-
+
 
 
 
@@ -491,7 +487,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -509,7 +505,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -518,50 +514,54 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@reason: 
-@Returns: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
 @device: 
-@Returns: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
 @device: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
+@device: 
 @connection: 
-@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@autoconnect: 
+@connection: 
+@error: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index cef5854d..35a6e306 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -53,13 +53,13 @@ NMDHCP4Config
 
 
 
-
+
 
 
 
 
-@config: 
-@option: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
@@ -72,13 +72,13 @@ NMDHCP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
+@option: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 2c113261..3e00467c 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -53,13 +53,13 @@ NMDHCP6Config
 
 
 
-
+
 
 
 
 
-@config: 
-@option: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
@@ -72,13 +72,13 @@ NMDHCP6Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
+@option: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
deleted file mode 100644
index 2f3b0280..00000000
--- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-glib-marshal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index e015c2af..08b6bcbd 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -73,14 +73,14 @@ NMIP4Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -101,16 +101,17 @@ NMIP4Config
 
 
 
-
+
 
 
 
 
-@config: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -128,7 +129,7 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
@@ -137,7 +138,7 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
@@ -146,13 +147,12 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f098e022..a9c44abd 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -68,14 +68,14 @@ NMIP6Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -89,16 +89,17 @@ NMIP6Config
 
 
 
-
+
 
 
 
 
-@config: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -116,7 +117,7 @@ NMIP6Config
 @Returns: 
 
 
-
+
 
 
 
@@ -125,13 +126,12 @@ NMIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index 93b2441e..bb17ec37 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -22,82 +22,82 @@ NMObject
 
 
 
-
+
 
 
 
 
+@NM_OBJECT_ERROR_UNKNOWN: 
+@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
 
-
+
 
 
 
 
-@nmobject: the object which received the signal.
-@arg1: 
-@arg2: 
 
-
+
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@object_creation_failed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_OBJECT_ERROR_UNKNOWN: 
-@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
 
-
+
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmobject: the object which received the signal.
+@arg1: 
+@arg2: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@object_creation_failed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 298d7b91..e8314074 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -22,6 +22,20 @@ NMRemoteConnection
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -111,18 +125,14 @@ NMRemoteConnection
 @user_data: 
 
 
-
-
-
-
-
-
-
-
+
 
 
 
 
+@bus: 
+@path: 
+@Returns: 
 
 
 
@@ -156,13 +166,3 @@ NMRemoteConnection
 @user_data: 
 
 
-
-
-
-
-
-@bus: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 44b4d4fb..6471c98c 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -22,218 +22,218 @@ NMRemoteSettings
 
 
 
-
+
 
 
 
 
+@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
 
-
+
 
 
 
 
-@nmremotesettings: the object which received the signal.
 
-
+
+
 
 
 
 
-@nmremotesettings: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@settings: 
-@connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@parent: 
-@new_connection: 
-@connections_read: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
 
-
+
+
 
 
 
 
 @settings: 
+@connection: 
 @error: 
 @user_data: 
 
 
-
+
 
 
 
 
+@settings: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmremotesettings: the object which received the signal.
 
-
-
+
 
 
 
 
+@nmremotesettings: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@new_connection: 
+@connections_read: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
+@bus: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@bus: 
+@cancellable: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
-@settings: 
-@path: 
+@result: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @settings: 
-@uuid: 
 @Returns: 
 
 
-
+
 
 
 
 
 @settings: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@bus: 
+@settings: 
+@uuid: 
 @Returns: 
 
 
-
+
 
 
 
 
-@bus: 
-@cancellable: 
+@settings: 
+@connection: 
 @callback: 
 @user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 9d23cbc5..68a5f3a1 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -22,161 +22,168 @@ NMSecretAgent
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@nmsecretagent: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
+@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
+@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: 
+
+
 
 
 
 
-
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@get_secrets: 
-@cancel_get_secrets: 
-@save_secrets: 
-@delete_secrets: 
-@registration_result: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@agent: 
-@connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
-@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: 
 
-
+
+
 
 
 
 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
 
-
+
 
 
 
 
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
+@nmsecretagent: the object which received the signal.
+@arg1: 
 
-
+
 
 
 
 
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@secrets: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@parent: 
+@get_secrets: 
+@cancel_get_secrets: 
+@save_secrets: 
+@delete_secrets: 
+@registration_result: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
 @self: 
-@connection: 
-@callback: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@self: 
 @Returns: 
 
 
@@ -203,15 +210,6 @@ NMSecretAgent
 @user_data: 
 
 
-
-
-
-
-
-@self: 
-@Returns: 
-
-
 
 
 
@@ -223,12 +221,14 @@ NMSecretAgent
 @user_data: 
 
 
-
+
 
 
 
 
 @self: 
-@Returns: 
+@connection: 
+@callback: 
+@user_data: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index 3086909a..c20f145d 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -22,6 +22,20 @@ NMVPNConnection
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -61,26 +75,13 @@ NMVPNConnection
 @_reserved5: 
 @_reserved6: 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-@vpn: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -93,13 +94,12 @@ NMVPNConnection
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@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
index f4c724a8..f38e277d 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -1,5 +1,5 @@
 
-NMVpnPluginUiWidget
+NMVpnPluginUi
 
 
 
@@ -22,17 +22,16 @@ NMVpnPluginUiWidget
 
 
 
-
+
 
 
 
 
-@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
+@error: 
+@Returns: 
 
-
+
+
 
 
 
@@ -41,104 +40,105 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
 
-@g_iface: 
-@ui_factory: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_name: 
-@delete_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
 
-
+
 
 
 
 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
 
-
+
+
 
 
 
 
-@g_iface: 
-@get_widget: 
-@update_connection: 
-@save_secrets: 
-@changed: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
 
-
-
+
 
 
 
 
+@g_iface: 
+@ui_factory: 
+@get_capabilities: 
+@import_from_file: 
+@export_to_file: 
+@get_suggested_name: 
+@delete_connection: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
+@iface: 
+@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
-@connection: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
 @path: 
-@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
+@path: 
+@connection: 
+@error: 
 @Returns: 
 
 
@@ -152,27 +152,27 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
-@path: 
+@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
+@g_iface: 
+@get_widget: 
+@update_connection: 
+@save_secrets: 
+@changed: 
 
 
 
@@ -183,7 +183,7 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
@@ -194,7 +194,7 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index ed0ab40b..3a6536da 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -22,25 +22,25 @@ nm-vpn-plugin-utils
 
 
 
-
+
 
 
 
 
-@data: 
-@secret_name: 
-@out_flags: 
+@fd: 
+@out_data: 
+@out_secrets: 
 @Returns: 
 
 
-
+
 
 
 
 
-@fd: 
-@out_data: 
-@out_secrets: 
+@data: 
+@secret_name: 
+@out_flags: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 7ece0f79..8c738c54 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -22,33 +22,19 @@ NMVPNPlugin
 
 
 
-
+
 
 
 
 
-@parent: 
 
-
+
+
 
 
 
 
-@parent: 
-@connect: 
-@need_secrets: 
-@disconnect: 
-@state_changed: 
-@ip4_config: 
-@login_banner: 
-@failure: 
-@quit: 
-@config: 
-@ip6_config: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+
 
 
 
@@ -65,64 +51,86 @@ NMVPNPlugin
 @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: 
+@config: 
+@ip6_config: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
 @plugin: 
-@err: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@plugin: 
 @Returns: 
 
 
-
+
 
 
 
 
 @plugin: 
-@reason: 
+@state: 
 
 
-
+
 
 
 
 
 @plugin: 
-@Returns: 
+@banner: 
 
 
-
+
 
 
 
 
 @plugin: 
-@Returns: 
+@reason: 
 
 
 
@@ -152,21 +160,13 @@ NMVPNPlugin
 @ip6_config: 
 
 
-
-
-
-
-
-@plugin: 
-@banner: 
-
-
-
+
 
 
 
 
 @plugin: 
-@state: 
+@err: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f5dca7a3..f270a1d2 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -22,39 +22,26 @@ NMWimaxNsp
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+
 
 
 
@@ -66,48 +53,60 @@ NMWimaxNsp
 @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
 @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@nsp: 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @nsp: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,22 +124,23 @@ NMWimaxNsp
 @Returns: 
 
 
-
+
 
 
 
 
 @nsp: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
+@nsp: 
 @connection: 
-@path: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 68f4aad3..fe98bd59 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.8.0
+0.9.8.8
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index adddb718..68627afb 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 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.
@@ -21,23 +20,51 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
 subdir = docs/libnm-util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -78,12 +105,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -91,6 +124,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -233,7 +267,6 @@ 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@
@@ -248,6 +281,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -433,6 +468,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### templates ####
+GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -475,11 +546,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -620,18 +691,18 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distclean-local 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 \
+	clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+	distclean distclean-generic distclean-libtool distclean-local \
+	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-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -641,35 +712,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    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 -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
 	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
-
-#### scan ####
+	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	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 \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -684,22 +748,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	$(AM_V_at)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
+	$(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
@@ -707,28 +768,20 @@ tmpl.stamp: tmpl-build.stamp
 $(srcdir)/tmpl/*.sgml:
 	@true
 
-#### xml ####
-
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	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
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -749,16 +802,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -775,7 +824,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -791,7 +840,7 @@ distclean-local:
 	    rm -rf tmpl; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -827,7 +876,7 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 3f55caf8..7c3d81b0 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -3,12 +3,12 @@
 
 
 NMConnection
-
+
 
 
 
 
-
+
 
 
 
@@ -46,47 +46,74 @@
 
 #include <nm-connection.h>
 
-                    NMConnection;
-                    NMConnectionClass;
 enum                NMConnectionError;
 #define             NM_CONNECTION_ERROR
+GQuark              nm_connection_error_quark           (void);
 #define             NM_CONNECTION_PATH
+                    NMConnection;
+                    NMConnectionClass;
+NMConnection *      nm_connection_new                   (void);
+NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+NMSetting *         nm_connection_create_setting        (const char *name);
 void                nm_connection_add_setting           (NMConnection *connection,
                                                          NMSetting *setting);
-void                nm_connection_clear_secrets         (NMConnection *connection);
-void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
+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);
-NMSetting *         nm_connection_create_setting        (const char *name);
 gboolean            nm_connection_diff                  (NMConnection *a,
                                                          NMConnection *b,
                                                          NMSettingCompareFlags flags,
                                                          GHashTable **out_settings);
-void                nm_connection_dump                  (NMConnection *connection);
-NMConnection *      nm_connection_duplicate             (NMConnection *connection);
-GQuark              nm_connection_error_quark           (void);
+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);
+void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
+gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);
+void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+const char *        nm_connection_get_path              (NMConnection *connection);
+const char *        nm_connection_get_virtual_iface_name
+                                                        (NMConnection *connection);
+gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);
 void                nm_connection_for_each_setting_value
                                                         (NMConnection *connection,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
+GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);
+void                nm_connection_dump                  (NMConnection *connection);
+GType               nm_connection_lookup_setting_type   (const char *name);
+GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+const char *        nm_connection_get_uuid              (NMConnection *connection);
 const char *        nm_connection_get_id                (NMConnection *connection);
-const char *        nm_connection_get_path              (NMConnection *connection);
-NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);
 NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
-NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
 NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
 NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
 NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
 NMSettingBridgePort * nm_connection_get_setting_bridge_port
                                                         (NMConnection *connection);
-NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);
 NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
 NMSettingConnection * nm_connection_get_setting_connection
                                                         (NMConnection *connection);
@@ -101,53 +128,26 @@ const char *        NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);
 NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);
 NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);
-NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
 NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
+NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
 NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
 NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);
 NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
                                                         (NMConnection *connection);
-const char *        nm_connection_get_uuid              (NMConnection *connection);
-const char *        nm_connection_get_virtual_iface_name
-                                                        (NMConnection *connection);
-gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);
-GType               nm_connection_lookup_setting_type   (const char *name);
-GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);
-const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);
-NMConnection *      nm_connection_new                   (void);
-NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);
-void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);
-gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);
-void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);
-GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);
-gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);
+NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 

 

 

 
Object Hierarchy

-
-  GObject
-   +----NMConnection
-

 
   GEnum
    +----NMConnectionError
 

+
+  GObject
+   +----NMConnection
+

 

 

 
Properties

@@ -183,28 +183,6 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 

 
Details

 

-
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;
-

-

-

-

-

-

 
enum NMConnectionError

 
typedef enum {
 	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
@@ -216,8 +194,11 @@ It should only be accessed through the functions described below.
 

 Describes errors that may result from operations involving a NMConnection.
 

-

+

+++
@@ -258,6 +239,24 @@ Describes errors that may result from operations involving a 
 

 

+
nm_connection_error_quark ()

+
GQuark              nm_connection_error_quark           (void);

+

+Registers an error quark for NMConnection if necessary.
+

+

 


 
 

 
NM_CONNECTION_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMConnection errors.

+

+

+

 
NM_CONNECTION_PATH

 
#define NM_CONNECTION_PATH "path"
 

@@ -266,112 +265,100 @@ Describes errors that may result from operations involving a 
 

 

-
nm_connection_add_setting ()

-
void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);

+
NMConnection

+
typedef struct _NMConnection NMConnection;

 

-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.
+The NMConnection struct contains only private data.
+It should only be accessed through the functions described below.
 

-

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


connection :
a NMConnection
-
setting :
the NMSetting to add to the connection object. [transfer full]
-

 

 

 

-
nm_connection_clear_secrets ()

-
void                nm_connection_clear_secrets         (NMConnection *connection);

+
NMConnectionClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection, const char * setting);
+} NMConnectionClass;
+

 

-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
 

-

+
+

+

+
nm_connection_new ()

+
NMConnection *      nm_connection_new                   (void);

+

+Creates a new NMConnection object with no NMSetting objects.
+

+

+++
-
-
+
+

 


 
connection :
the NMConnection
-
Returns :
the new empty NMConnection object
 

 

 

 

 

-
nm_connection_clear_secrets_with_flags ()

-
void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

+
nm_connection_new_from_hash ()

+
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);

 

-Clears and frees secrets determined by func.
+Creates a new NMConnection from a hash table describing the connection.  See
+nm_connection_to_hash() for a description of the expected hash table.
 

-

+

+++
-
-
+
-
-
+
+
-
-
+
+

 


 
 
connection :
the NMConnection
+
hash :
the GHashTable describing
+the connection. [element-type utf8 GLib.HashTable]
 
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
-
error :
on unsuccessful return, an error
 

 
user_data :
caller-supplied data passed to func
-
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_compare ()

-
gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);

+
nm_connection_duplicate ()

+
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

 

-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.
+Duplicates a NMConnection.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
+

 


 
 
a :
a NMConnection
-
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
connection :
the NMConnection to duplicate
 

 

 
Returns :

-TRUE if the comparison succeeds, FALSE if it does nota new NMConnection containing the same settings and properties
+as the source NMConnection. [transfer full]
+
 

 
 

@@ -383,8 +370,11 @@ each flag's behavior.
 

 Create a new NMSetting object of the desired type, given a setting name.
 

-

+

+++
@@ -392,7 +382,7 @@ Create a new 
 
-
@@ -400,88 +390,89 @@ Create a new 
 

 

-
nm_connection_diff ()

-
gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);

+
nm_connection_add_setting ()

+
void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);

 

-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.
+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.
 

-

 


 
 

 
name :

 
Returns :
the new setting object, or NULL if the setting name was unknown. [transfer full]
+the new setting object, or NULL if the setting name was unknown. [transfer full]
 
 

 

+

+++
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-

 


 
 
a :
connection :

 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 (utf8 to guint32), which contains the key names that
-differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
+
setting :
the NMSetting to add to the connection object. [transfer full]
 
 
Returns :

-TRUE if the connections contain the same values, FALSE if they do
-not

 
 

 

 

 

-
nm_connection_dump ()

-
void                nm_connection_dump                  (NMConnection *connection);

+
nm_connection_remove_setting ()

+
void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);

 

-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.
+Removes the NMSetting with the given GType from the NMConnection.  This
+operation dereferences the NMSetting object.
 

-

+

+-
++
+
+
-
-
+
+
+
+
+
+

 




 
connection :
the NMConnection
+a NMConnection
 
setting_type :
the GType of the setting object to remove

 

 

 

 

-
nm_connection_duplicate ()

-
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

+
nm_connection_get_setting ()

+
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);

 

-Duplicates a NMConnection.
+Gets the NMSetting with the given GType, if one has been previously added
+to the NMConnection.
 

-

+

+++
-
+
+
+
+
+
-
@@ -489,134 +480,219 @@ as the source 
 

 

-
nm_connection_error_quark ()

-
GQuark              nm_connection_error_quark           (void);

+
nm_connection_get_setting_by_name ()

+
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);

 

-Registers an error quark for NMConnection if necessary.
+Gets the NMSetting with the given name, if one has been previously added
+the the NMConnection.
 

-

 


 
 

 
connection :
the NMConnection to duplicatea NMConnection
+
setting_type :
the GType of the setting object to return
 

 

 
Returns :
a new NMConnection containing the same settings and properties
-as the source NMConnection. [transfer full]
+the NMSetting, or NULL if no setting of that type was previously
+added to the NMConnection. [transfer none]
 
 

 

+

+-
++
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+

 



connection :
a NMConnection
+
name :
a setting name

 
Returns :
the error quark used for NMConnection errors.
the NMSetting, or NULL if no setting with that name was previously
+added to the NMConnection. [transfer none]
+

 

 

 

 

-
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.
-

-

+
nm_connection_replace_settings ()

+
gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);

+

+++
-
-
-
+
-
-
+
+
+
+
+
+

 


 
 

 
connection :
the NMConnection
+a NMConnection
 
 

 
func :
user-supplied function called for each setting's property. [scope call]
+
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
 
 

 
user_data :
user data passed to func at each invocation
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_get_id ()

-
const char *        nm_connection_get_id                (NMConnection *connection);

+
nm_connection_compare ()

+
gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);

 

-A shortcut to return the ID from the connection's NMSettingConnection.
+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.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
-
+

 


 
 
connection :
the NMConnection
+
a :
a NMConnection
+
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 

 

 
Returns :
the ID from the connection's 'connection' setting
+TRUE if the comparison succeeds, FALSE if it does not
 

 
 

 

 

 

-
nm_connection_get_path ()

-
const char *        nm_connection_get_path              (NMConnection *connection);

+
nm_connection_diff ()

+
gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);

 

-Returns the connection's D-Bus path.
+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.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 
connection :
the NMConnection
+
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 (utf8 to guint32), which contains the key names that
+differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
 
 

 

 
Returns :
the D-Bus path of the connection, previously set by a call to
-nm_connection_set_path().
+TRUE if the connections contain the same values, FALSE if they do
+not
 

 
 

 

 

 

-
nm_connection_get_setting ()

-
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_verify ()

+
gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);

 

-Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.
+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 :
a NMConnection
-the NMConnection to verify
 

 
setting_type :
the GType of the setting object to return
error :
location to store error, or NULL
+
 

 

 
Returns :
the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection. [transfer none]
-
+TRUE if the connection is valid, FALSE if it is not
 

 
 

 

 

 

-
nm_connection_get_setting_802_1x ()

-
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

+
nm_connection_need_secrets ()

+
const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);

 

-A shortcut to return any NMSetting8021x the connection might contain.
+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.
 

-

+

+++
@@ -624,22 +700,57 @@ A shortcut to return any Returns :

-
+
+
+
+
+

 


 
 

 
connection :
an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
+
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 array itself with g_ptr_array_free(), but not free its
+elements. [out][element-type utf8][allow-none][transfer container]
 
 
Returns :
the setting name of the NMSetting object which has invalid or
+missing secrets

 
 

 

 

 

-
nm_connection_get_setting_adsl ()

-
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+
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_clear_secrets_with_flags ()

+
void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

 

-A shortcut to return any NMSettingAdsl the connection might contain.
+Clears and frees secrets determined by func.
 

-

+

+++
@@ -647,8 +758,14 @@ A shortcut to return any Returns :

-
+
+
+
+
+
@@ -656,14 +773,24 @@ A shortcut to return any 
-
nm_connection_get_setting_bluetooth ()

-
NMSettingBluetooth * nm_connection_get_setting_bluetooth
-                                                        (NMConnection *connection);

+
nm_connection_update_secrets ()

+
gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);

-A shortcut to return any NMSettingBluetooth the connection might contain.
+Update the specified setting's secrets, given a hash table of secrets
+intended for that setting (deserialized from D-Bus for example).  Will also
+extract the given setting's secrets hash if given a hash of hashes, as would
+be returned from nm_connection_to_hash().  If setting_name is NULL, expects
+a fully serialized NMConnection as returned by nm_connection_to_hash() and
+will update all secrets from all settings contained in secrets.
 

-

 


 
 

 
connection :
an NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
+
func :
function to be called to determine whether a
+specific secret should be cleared or not. [scope call]
+
user_data :
caller-supplied data passed to func
 
 

 
 

+

+++
@@ -671,22 +798,44 @@ A shortcut to return any Returns :

-
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 

 
connection :
an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
+
setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the secrets were successfully updated, FALSE if the update
+failed (tried to update secrets for a setting that doesn't exist, etc)

 
 

 

 

 

-
nm_connection_get_setting_bond ()

-
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

+
nm_connection_set_path ()

+
void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);

 

-A shortcut to return any NMSettingBond the connection might contain.
+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.
 

-

+

+++
@@ -694,22 +843,25 @@ A shortcut to return any Returns :

-
+
+

 


 
 

 
connection :
an NMSettingBond if the connection contains one, otherwise NULL. [transfer none]
-
path :
the D-Bus path of the connection as given by the settings service
+which provides the connection
 

 
 

 

 

 

-
nm_connection_get_setting_bridge ()

-
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);

+
nm_connection_get_path ()

+
const char *        nm_connection_get_path              (NMConnection *connection);

 

-A shortcut to return any NMSettingBridge the connection might contain.
+Returns the connection's D-Bus path.
 

-

+

+++
@@ -718,31 +870,37 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
-the D-Bus path of the connection, previously set by a call to
+nm_connection_set_path().
 

 
 

 

 

 

-
nm_connection_get_setting_bridge_port ()

-
NMSettingBridgePort * nm_connection_get_setting_bridge_port
+
nm_connection_get_virtual_iface_name ()

+
const char *        nm_connection_get_virtual_iface_name
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingBridgePort the connection might contain.
+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings. This function abstracts all
+connection types which require this functionality. For all other
+connection types, this function will return NULL.
 

-

+

+++
-
-
@@ -750,43 +908,54 @@ A shortcut to return any 
-
nm_connection_get_setting_by_name ()

-
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);

+
nm_connection_is_type ()

+
gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);

-Gets the NMSetting with the given name, if one has been previously added
-the the NMConnection.
+A convenience function to check if the given connection is a particular
+type (ie wired, wifi, ppp, etc). Checks the "type"
+property of the connection and matches that against type.
 

-

 


 
 

 
connection :
the NMConnection
+The NMConnection
 
 

 

 
Returns :
an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
+Name of the kernel interface or NULL
 
 

 
 

+

+++
-
-
-
+
+
-
+

 


 
 

 
connection :
a NMConnection
+the NMConnection
 
 

 
name :
a setting name
type :
a setting name to check the connection's type against (like
+NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)
 

 

 
Returns :
the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection. [transfer none]
-
+TRUE if the connection is of the given type, FALSE if not
 

 
 

 

 

 

-
nm_connection_get_setting_cdma ()

-
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

+
nm_connection_for_each_setting_value ()

+
void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);

 

-A shortcut to return any NMSettingCdma the connection might contain.
+Iterates over the properties of each NMSetting object in the NMConnection,
+calling the supplied user function for each property.
 

-

+

+++
@@ -794,23 +963,35 @@ A shortcut to return any Returns :

-
+
+
+
+
+

 


 
 

 
connection :
an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
+
func :
user-supplied function called for each setting's property. [scope call]
 
 
user_data :
user data passed to func at each invocation

 
 

 

 

 

-
nm_connection_get_setting_connection ()

-
NMSettingConnection * nm_connection_get_setting_connection
-                                                        (NMConnection *connection);

+
nm_connection_to_hash ()

+
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);

 

-A shortcut to return any NMSettingConnection the connection might contain.
+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.
 

-

+

+++
@@ -818,8 +999,16 @@ A shortcut to return any flags :

+
+
+
-
@@ -827,85 +1016,87 @@ A shortcut to return any 
-
nm_connection_get_setting_gsm ()

-
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

+
nm_connection_dump ()

+
void                nm_connection_dump                  (NMConnection *connection);

-A shortcut to return any NMSettingGsm the connection might contain.
+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 :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
+

 
Returns :
an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
+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. [transfer full][element-type utf8 GLib.HashTable]
 
 

 
 

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
connection :

 the NMConnection
 
Returns :
an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
-

 

 

 

 

-
nm_connection_get_setting_infiniband ()

-
NMSettingInfiniband * nm_connection_get_setting_infiniband
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type ()

+
GType               nm_connection_lookup_setting_type   (const char *name);

 

-A shortcut to return any NMSettingInfiniband the connection might contain.
+Returns the GType of the setting's class for a given setting name.
 

-

+

+++
-
-
+
+
-
+

 


 
 
connection :
the NMConnection
-
name :
a setting name
 

 

 
Returns :
an NMSettingInfiniband if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip4_config ()

-
NMSettingIP4Config * nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type_by_quark ()

+
GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);

 

-A shortcut to return any NMSettingIP4Config the connection might contain.
+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.
 

-

+

+++
-
-
+
+
-
+

 


 
 
connection :
the NMConnection
-
error_quark :
a setting error quark
 

 

 
Returns :
an NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip6_config ()

-
NMSettingIP6Config * nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);

+
nm_connection_get_uuid ()

+
const char *        nm_connection_get_uuid              (NMConnection *connection);

 

-A shortcut to return any NMSettingIP6Config the connection might contain.
+A shortcut to return the UUID from the connection's NMSettingConnection.
 

-

+

+++
@@ -914,21 +1105,23 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
-the UUID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_get_setting_olpc_mesh ()

-
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

+
nm_connection_get_id ()

+
const char *        nm_connection_get_id                (NMConnection *connection);

 

-A shortcut to return any NMSettingOlpcMesh the connection might contain.
+A shortcut to return the ID from the connection's NMSettingConnection.
 

-

+

+++
@@ -937,21 +1130,23 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
-the ID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_get_setting_ppp ()

-
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

+
nm_connection_get_setting_802_1x ()

+
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

 

-A shortcut to return any NMSettingPPP the connection might contain.
+A shortcut to return any NMSetting8021x the connection might contain.
 

-

+

+++
@@ -960,7 +1155,7 @@ A shortcut to return any Returns :

-
@@ -968,13 +1163,17 @@ A shortcut to return any 
-
nm_connection_get_setting_pppoe ()

-
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

+
nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth * nm_connection_get_setting_bluetooth
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingPPPOE the connection might contain.
+A shortcut to return any NMSettingBluetooth the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
+an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -983,7 +1182,7 @@ A shortcut to return any Returns :

-
@@ -991,13 +1190,16 @@ A shortcut to return any 
-
nm_connection_get_setting_serial ()

-
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

+
nm_connection_get_setting_bond ()

+
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

-A shortcut to return any NMSettingSerial the connection might contain.
+A shortcut to return any NMSettingBond the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1006,7 +1208,7 @@ A shortcut to return any Returns :

-
@@ -1014,13 +1216,16 @@ A shortcut to return any 
-
nm_connection_get_setting_vlan ()

-
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

+
nm_connection_get_setting_bridge ()

+
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);

-A shortcut to return any NMSettingVlan the connection might contain.
+A shortcut to return any NMSettingBridge the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingSerial if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBond if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1029,7 +1234,7 @@ A shortcut to return any Returns :

-
@@ -1037,13 +1242,17 @@ A shortcut to return any 
-
nm_connection_get_setting_vpn ()

-
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

+
nm_connection_get_setting_bridge_port ()

+
NMSettingBridgePort * nm_connection_get_setting_bridge_port
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingVPN the connection might contain.
+A shortcut to return any NMSettingBridgePort the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingVlan if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1052,7 +1261,7 @@ A shortcut to return any Returns :

-
@@ -1060,13 +1269,16 @@ A shortcut to return any 
-
nm_connection_get_setting_wimax ()

-
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

+
nm_connection_get_setting_cdma ()

+
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

-A shortcut to return any NMSettingWimax the connection might contain.
+A shortcut to return any NMSettingCdma the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1075,7 +1287,7 @@ A shortcut to return any Returns :

-
@@ -1083,13 +1295,17 @@ A shortcut to return any 
-
nm_connection_get_setting_wired ()

-
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

+
nm_connection_get_setting_connection ()

+
NMSettingConnection * nm_connection_get_setting_connection
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingWired the connection might contain.
+A shortcut to return any NMSettingConnection the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1098,7 +1314,7 @@ A shortcut to return any Returns :

-
@@ -1106,13 +1322,16 @@ A shortcut to return any 
-
nm_connection_get_setting_wireless ()

-
NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);

+
nm_connection_get_setting_gsm ()

+
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

-A shortcut to return any NMSettingWireless the connection might contain.
+A shortcut to return any NMSettingGsm the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1121,7 +1340,7 @@ A shortcut to return any Returns :

-
@@ -1129,14 +1348,17 @@ A shortcut to return any 
-
nm_connection_get_setting_wireless_security ()

-
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+
nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband * nm_connection_get_setting_infiniband
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingWirelessSecurity the connection might contain.
+A shortcut to return any NMSettingInfiniband the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
 
 

 

+

+++
@@ -1145,7 +1367,7 @@ A shortcut to return any 
 
-
@@ -1153,13 +1375,17 @@ A shortcut to return any 
 

 

-
nm_connection_get_uuid ()

-
const char *        nm_connection_get_uuid              (NMConnection *connection);

+
nm_connection_get_setting_ip4_config ()

+
NMSettingIP4Config * nm_connection_get_setting_ip4_config
+                                                        (NMConnection *connection);

 

-A shortcut to return the UUID from the connection's NMSettingConnection.
+A shortcut to return any NMSettingIP4Config the connection might contain.
 

-

 


 
 

 
connection :

 
Returns :
an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingInfiniband if the connection contains one, otherwise NULL. [transfer none]
 
 

 

+

+++
@@ -1168,49 +1394,51 @@ A shortcut to return the UUID from the connection's Returns :

-
+

 


 
 

 
connection :
the UUID from the connection's 'connection' settingan NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_virtual_iface_name ()

-
const char *        nm_connection_get_virtual_iface_name
+
nm_connection_get_setting_ip6_config ()

+
NMSettingIP6Config * nm_connection_get_setting_ip6_config
                                                         (NMConnection *connection);

 

-Returns the name of the virtual kernel interface which the connection
-needs to use if specified in the settings. This function abstracts all
-connection types which require this functionality. For all other
-connection types, this function will return NULL.
+A shortcut to return any NMSettingIP6Config the connection might contain.
 

-

+

+++
-
-
+

 


 
 

 
connection :
The NMConnection
+the NMConnection
 
 

 

 
Returns :
Name of the kernel interface or NULLan NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_is_type ()

-
gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);

+
nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

 

-A convenience function to check if the given connection is a particular
-type (ie wired, wifi, ppp, etc). Checks the "type"
-property of the connection and matches that against type.
+A shortcut to return any NMSettingOlpcMesh the connection might contain.
 

-

+

+++
@@ -1218,76 +1446,77 @@ property of the connection and matches that against 
 
 
-
-
-
-
-
+

 


 
 

 
connection :

 
type :
a setting name to check the connection's type against (like
-NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
Returns :

-TRUE if the connection is of the given type, FALSE if notan NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_lookup_setting_type ()

-
GType               nm_connection_lookup_setting_type   (const char *name);

+
nm_connection_get_setting_ppp ()

+
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

 

-Returns the GType of the setting's class for a given setting name.
+A shortcut to return any NMSettingPPP the connection might contain.
 

-

+

+++
-
-
+
+
-
+

 


 
 
name :
a setting name
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_lookup_setting_type_by_quark ()

-
GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);

+
nm_connection_get_setting_pppoe ()

+
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

 

-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.
+A shortcut to return any NMSettingPPPOE the connection might contain.
 

-

+

+++
-
-
+
+
-
+

 


 
 
error_quark :
a setting error quark
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_need_secrets ()

-
const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);

+
nm_connection_get_setting_serial ()

+
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

 

-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.
+A shortcut to return any NMSettingSerial the connection might contain.
 

-

+

+++
@@ -1295,137 +1524,103 @@ secrets are needed.
 
-
-
-
-
-
+

 


 
 

 
connection :

 

 
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(). [out callee-allocates][element-type utf8][allow-none][transfer full]
-

 
Returns :
the setting name of the NMSetting object which has invalid or
-missing secretsan NMSettingSerial if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
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);

+
nm_connection_get_setting_vpn ()

+
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

 

-Creates a new NMConnection from a hash table describing the connection.  See
-nm_connection_to_hash() for a description of the expected hash table.
+A shortcut to return any NMSettingVPN the connection might contain.
 

-

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
hash :
the GHashTable describing
-the connection. [element-type utf8 GLib.HashTable]
+
connection :
the NMConnection
 
 

 
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
-validatean NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_remove_setting ()

-
void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_get_setting_wimax ()

+
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

 

-Removes the NMSetting with the given GType from the NMConnection.  This
-operation dereferences the NMSetting object.
+A shortcut to return any NMSettingWimax the connection might contain.
 

-

+

+++
-
-
-
+
+

 


 
 

 
connection :
a NMConnection
+the NMConnection
 
 

 
setting_type :
the GType of the setting object to remove
Returns :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_replace_settings ()

-
gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);

-

+
nm_connection_get_setting_adsl ()

+
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+

+A shortcut to return any NMSettingAdsl the connection might contain.
+

+

+++
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
connection :
a NMConnection
-
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
-
error :
location to store error, or NULL
+the NMConnection
 
 

 

 
Returns :

-TRUE if the settings were valid and added to the connection, FALSE
-if they were notan NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_set_path ()

-
void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);

+
nm_connection_get_setting_wired ()

+
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

 

-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.
+A shortcut to return any NMSettingWired the connection might contain.
 

-

+

+++
@@ -1433,28 +1628,25 @@ property.
 
-
-
+
+

 


 
 

 
connection :

 

 
path :
the D-Bus path of the connection as given by the settings service
-which provides the connection
Returns :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_to_hash ()

-
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);

+
nm_connection_get_setting_wireless ()

+
NMSettingWireless * nm_connection_get_setting_wireless  (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.
+A shortcut to return any NMSettingWireless the connection might contain.
 

-

+

+++
@@ -1462,16 +1654,8 @@ properties of the 
 
-
-
-
-
-
@@ -1479,21 +1663,17 @@ with 
-
nm_connection_update_secrets ()

-
gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);

+
nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+                                                        (NMConnection *connection);

-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).  Will also
-extract the given setting's secrets hash if given a hash of hashes, as would
-be returned from nm_connection_to_hash().  If setting_name is NULL, expects
-a fully serialized NMConnection as returned by nm_connection_to_hash() and
-will update all secrets from all settings contained in secrets.
+A shortcut to return any NMSettingWirelessSecurity the connection might contain.
 

-

 


 
 

 
connection :

 
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-

 
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. [transfer full][element-type utf8 GLib.HashTable]
+an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1501,61 +1681,35 @@ will update all secrets from all settings contained in 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
connection :

 
setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
-
error :
location to store error, or NULL
-

 
Returns :

-TRUE if the secrets were successfully updated, FALSE if the update
-failed (tried to update secrets for a setting that doesn't exist, etc)an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_verify ()

-
gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);

+
nm_connection_get_setting_vlan ()

+
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

 

-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.
+A shortcut to return any NMSettingVlan the connection might contain.
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
connection :
the NMConnection to verify
error :
location to store error, or NULL
+the NMConnection
 
 

 

 
Returns :

-TRUE if the connection is valid, FALSE if it is notan NMSettingVlan if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

@@ -1583,8 +1737,11 @@ of the D-Bus path of the connection as provided by a settings service.
 The ::secrets-cleared signal is emitted when the secrets of a connection
 are cleared.
 

-

+

+++
@@ -1607,8 +1764,11 @@ are cleared.
 The ::secrets-updated signal is emitted when the secrets of a setting
 have been changed.
 

-

 


 
 

 
connection :

+

+++
@@ -1630,6 +1790,6 @@ updated

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 12b826b1..a44ef38f 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -3,12 +3,12 @@
 NMSetting
-
+
-
+
@@ -41,74 +41,86 @@
 

 


 
 

 
connection :

 
 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
+
 #include <nm-setting.h>
 
+enum                NMSettingError;
+#define             NM_SETTING_ERROR
+GQuark              nm_setting_error_quark              (void);
+#define             NM_SETTING_PARAM_SERIALIZE
+#define             NM_SETTING_PARAM_REQUIRED
+#define             NM_SETTING_PARAM_SECRET
+#define             NM_SETTING_PARAM_FUZZY_IGNORE
+#define             NM_SETTING_NAME
+enum                NMSettingSecretFlags;
+enum                NMSettingCompareFlags;
                     NMSetting;
-                    NMSettingClass;
 gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
                                                          NMSettingSecretFlags flags,
                                                          gpointer user_data);
-enum                NMSettingCompareFlags;
-enum                NMSettingDiffResult;
-enum                NMSettingError;
-enum                NMSettingHashFlags;
-enum                NMSettingSecretFlags;
+                    NMSettingClass;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
                                                          const GValue *value,
                                                          GParamFlags flags,
                                                          gpointer user_data);
-#define             NM_SETTING_ERROR
-#define             NM_SETTING_NAME
-#define             NM_SETTING_PARAM_FUZZY_IGNORE
-#define             NM_SETTING_PARAM_REQUIRED
-#define             NM_SETTING_PARAM_SECRET
-#define             NM_SETTING_PARAM_SERIALIZE
-void                nm_setting_clear_secrets            (NMSetting *setting);
-void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
+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);
+const char *        nm_setting_get_name                 (NMSetting *setting);
+gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);
 gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags);
+enum                NMSettingDiffResult;
 gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);
-NMSetting *         nm_setting_duplicate                (NMSetting *setting);
 void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
-GQuark              nm_setting_error_quark              (void);
-const char *        nm_setting_get_name                 (NMSetting *setting);
+char *              nm_setting_to_string                (NMSetting *setting);
+void                nm_setting_clear_secrets            (NMSetting *setting);
+void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
+GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
+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);
-const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
-GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
-NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);
 gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags flags,
                                                          GError **error);
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
-char *              nm_setting_to_string                (NMSetting *setting);
-gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);
+const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingError
+

+
+  GEnum
+   +----NMSettingSecretFlags
+

+
+  GEnum
+   +----NMSettingCompareFlags
+

 
   GObject
    +----NMSetting
@@ -135,25 +147,13 @@ const char *        NMSettingWirelessSecurity
          +----NMSettingVPN
 

-
-  GEnum
-   +----NMSettingCompareFlags
-

-
-  GEnum
-   +----NMSettingDiffResult
-

-
-  GEnum
-   +----NMSettingError
-

 
   GEnum
    +----NMSettingHashFlags
 

 
   GEnum
-   +----NMSettingSecretFlags
+   +----NMSettingDiffResult
 

 

 

@@ -176,95 +176,165 @@ of properties and allowed values.
 

 
Details

 

-
NMSetting

-
typedef struct _NMSetting NMSetting;

+
enum NMSettingError

+
typedef enum {
+	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
+} NMSettingError;
+

 

-The NMSetting struct contains only private data.
-It should only be accessed through the functions described below.
+Describes errors that may result from operations involving a NMSetting.
 

+

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




NM_SETTING_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_ERROR_PROPERTY_NOT_FOUND
a property required by the operation
+  was not found; for example, an attempt to update an invalid secret
+
NM_SETTING_ERROR_PROPERTY_NOT_SECRET
an operation which requires a secret
+  was attempted on a non-secret property
+
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
the operation requires a property
+  of a specific type, or the value couldn't be transformed to the same type
+  as the property being acted upon
+

 

 

 

-
NMSettingClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual functions */
-	gboolean    (*verify)            (NMSetting  *setting,
-	                                  GSList     *all_settings,
-	                                  GError     **error);
-
-	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
-
-	gboolean    (*update_one_secret) (NMSetting  *setting,
-	                                  const char *key,
-	                                  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);
-
-	/* Returns TRUE if the given property contains the same value in both settings */
-	gboolean    (*compare_property)  (NMSetting *setting,
-	                                  NMSetting *other,
-	                                  const GParamSpec *prop_spec,
-	                                  NMSettingCompareFlags flags);
-
-	void        (*clear_secrets_with_flags) (NMSetting *setting,
-	                                         GParamSpec *pspec,
-	                                         NMSettingClearSecretsWithFlagsFn func,
-	                                         gpointer user_data);
-
-	const char *(*get_virtual_iface_name) (NMSetting *setting);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-} NMSettingClass;
+
NM_SETTING_ERROR

+
#define NM_SETTING_ERROR nm_setting_error_quark ()
 

 

 

 

 

 

-
NMSettingClearSecretsWithFlagsFn ()

-
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
-                                                         const char *secret,
-                                                         NMSettingSecretFlags flags,
-                                                         gpointer user_data);

-

+
nm_setting_error_quark ()

+
GQuark              nm_setting_error_quark              (void);

+

+Registers an error quark for NMSetting if necessary.
+

+

++++
+
+
+
+
+




Returns :
the error quark used for NMSetting errors.

+

+

+

+
NM_SETTING_PARAM_SERIALIZE

+
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_REQUIRED

+
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_SECRET

+
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_FUZZY_IGNORE

+
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_NAME

+
#define NM_SETTING_NAME "name"
+

+

+

+

+

+

+
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.
+

+

+++
-
-
-
-
-
-
+
+
-
-
+
-
-
+
-
-
+
+

 


 
 
setting :
The setting for which secrets are being iterated
secret :
The secret's name
NM_SETTING_SECRET_FLAG_NONE
the system is responsible for providing and
+storing this secret (default)
+
 

 
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
+
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
 
 

 
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
+
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
+should be requested from the user each time it is needed
 
 

 
Returns :

-TRUE to clear the secret, FALSE to not clear the secret
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
+
 

 
 

@@ -285,8 +355,11 @@ It should only be accessed through the functions described below.
 These flags modify the comparison behavior when comparing two settings or
 two connections.
 

-

+

+++
@@ -329,75 +402,138 @@ storage (ie, the secret's flag includes NM_SETTING_S
 
 

 

-
enum NMSettingDiffResult

-
typedef enum {
-	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
-	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
-	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
-} NMSettingDiffResult;
-

+
NMSetting

+
typedef struct _NMSetting NMSetting;

 

-These values indicate the result of a setting difference operation.
+The NMSetting struct contains only private data.
+It should only be accessed through the functions described below.
 

-

 


 
 

 
NM_SETTING_COMPARE_FLAG_EXACT

+
+

+

+
NMSettingClearSecretsWithFlagsFn ()

+
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                                         const char *secret,
+                                                         NMSettingSecretFlags flags,
+                                                         gpointer user_data);

+

+++
 
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+

 


 
NM_SETTING_DIFF_RESULT_UNKNOWN
unknown result
-
setting :
The setting for which secrets are being iterated
 

 
NM_SETTING_DIFF_RESULT_IN_A
the property is present in setting A
+
secret :
The secret's name
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
 
 

 
NM_SETTING_DIFF_RESULT_IN_B
the property is present in setting B
+
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
 
 
Returns :

+TRUE to clear the secret, FALSE to not clear the secret

 
 

 

 

 

-
enum NMSettingError

-
typedef enum {
-	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
-} NMSettingError;
+
NMSettingClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual functions */
+	gboolean    (*verify)            (NMSetting  *setting,
+	                                  GSList     *all_settings,
+	                                  GError     **error);
+
+	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
+
+	gboolean    (*update_one_secret) (NMSetting  *setting,
+	                                  const char *key,
+	                                  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);
+
+	/* Returns TRUE if the given property contains the same value in both settings */
+	gboolean    (*compare_property)  (NMSetting *setting,
+	                                  NMSetting *other,
+	                                  const GParamSpec *prop_spec,
+	                                  NMSettingCompareFlags flags);
+
+	void        (*clear_secrets_with_flags) (NMSetting *setting,
+	                                         GParamSpec *pspec,
+	                                         NMSettingClearSecretsWithFlagsFn func,
+	                                         gpointer user_data);
+
+	const char *(*get_virtual_iface_name) (NMSetting *setting);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+} NMSettingClass;
 

 

-Describes errors that may result from operations involving a NMSetting.
 

-

+
+

+

+
NMSettingValueIterFn ()

+
void                (*NMSettingValueIterFn)             (NMSetting *setting,
+                                                         const char *key,
+                                                         const GValue *value,
+                                                         GParamFlags flags,
+                                                         gpointer user_data);

+

+++
-
-
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
@@ -416,8 +552,11 @@ Describes errors that may result from operations involving a nm_setting_to_hash().
 

-

 


 
 
NM_SETTING_ERROR_UNKNOWN
unknown or unclassified error
+
setting :
The setting for which properties are being iterated, given to
+nm_setting_enumerate_values()
 
 

 
NM_SETTING_ERROR_PROPERTY_NOT_FOUND
a property required by the operation
-  was not found; for example, an attempt to update an invalid secret
-
key :
The value/property name
 

 
NM_SETTING_ERROR_PROPERTY_NOT_SECRET
an operation which requires a secret
-  was attempted on a non-secret property
+
value :
The property's value
flags :
The property's flags, like NM_SETTING_PARAM_SECRET
 
 

 
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
the operation requires a property
-  of a specific type, or the value couldn't be transformed to the same type
-  as the property being acted upon
+
user_data :
User data passed to nm_setting_enumerate_values()
 
 

 

+

+++
@@ -439,49 +578,34 @@ when calling 
-
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;
-

+
nm_setting_to_hash ()

+
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);

-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.
+Converts the NMSetting into a GHashTable mapping each setting property
+name to a GValue describing that property, suitable for marshalling over
+D-Bus or serializing.  The mapping is string to GValue.
 

-

 


 
 

 
NM_SETTING_HASH_FLAG_ALL

 

+

+++
-
-
-
-
-
-
+
-
-
+
-
-
+
@@ -489,136 +613,131 @@ secret is not required
 

-
NMSettingValueIterFn ()

-
void                (*NMSettingValueIterFn)             (NMSetting *setting,
-                                                         const char *key,
-                                                         const GValue *value,
-                                                         GParamFlags flags,
-                                                         gpointer user_data);

-

 


 
 
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
+
setting :
the NMSetting
 
 

 
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
-should be requested from the user each time it is needed
+
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
 
 

 
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
+
Returns :
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);

+

+Creates a new NMSetting object and populates that object with the properties
+contained in the hash table, using each hash key as the property to set,
+and each hash value as the value to set that property to.  Setting properties
+are strongly typed, thus the GValue type of the hash value must be correct.
+See the documentation on each NMSetting object subclass for the correct
+property names and value types.
+

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
+
+

 


 
 
setting :
The setting for which properties are being iterated, given to
-nm_setting_enumerate_values()
-
key :
The value/property name
value :
The property's value
setting_type :
the NMSetting type which the hash contains properties for
 

 
flags :
The property's flags, like NM_SETTING_PARAM_SECRET
+
hash :
the GHashTable containing a
+string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]
 
 

 
user_data :
User data passed to nm_setting_enumerate_values()
-
Returns :
a new NMSetting object populated with the properties from the
+hash table, or NULL on failure
 

 
 

 

 

 

-
NM_SETTING_ERROR

-
#define NM_SETTING_ERROR nm_setting_error_quark ()
-

-

-

-

-

-

-
NM_SETTING_NAME

-
#define NM_SETTING_NAME "name"
-

-

-

-

-

-

-
NM_SETTING_PARAM_FUZZY_IGNORE

-
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_REQUIRED

-
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_SECRET

-
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_SERIALIZE

-
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
-

+
nm_setting_duplicate ()

+
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

 

+Duplicates a NMSetting.
 

+

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




setting :
the NMSetting to duplicate
Returns :
a new NMSetting containing the same properties and values as the
+source NMSetting. [transfer full]
+

 

 

 

-
nm_setting_clear_secrets ()

-
void                nm_setting_clear_secrets            (NMSetting *setting);

+
nm_setting_get_name ()

+
const char *        nm_setting_get_name                 (NMSetting *setting);

 

-Resets and clears any secrets in the setting.  Secrets should be added to the
-setting only when needed, and cleared immediately after use to prevent
-leakage of information.
+Returns the type name of the NMSetting object
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSetting
 
Returns :
a string containing the type name of the NMSetting object,
+like 'ppp' or 'wireless' or 'wired'.

 

 

 

 

-
nm_setting_clear_secrets_with_flags ()

-
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

+
nm_setting_verify ()

+
gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);

 

-Clears and frees secrets determined by func.
+Validates the setting.  Each setting's properties have allowed values, and
+some are dependent on other values (hence the need for all_settings).  The
+returned GError contains information about which property of the setting
+failed validation, and in what way that property failed validation.
 

-

+

+++
-
+
-
-
+
-
-
+
+
+
+
+

 


 
 

 
setting :
the NMSetting
-the NMSetting to verify
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
+
all_settings :
a GSList of all settings
+in the connection from which setting came. [element-type NMSetting]
 
 

 
user_data :
caller-supplied data passed to func
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the setting is valid, FALSE if it is not

 
 

 

@@ -633,8 +752,11 @@ Compares two NMSettingCompareFlags
 for a description of each flag's behavior.
 

-

+

+++
@@ -660,6 +782,42 @@ for a description of each flag's behavior.
 

+
enum NMSettingDiffResult

+
typedef enum {
+	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
+	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
+	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
+} NMSettingDiffResult;
+

+

+These values indicate the result of a setting difference operation.
+

+

 


 
 

 
a :

 
 

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




NM_SETTING_DIFF_RESULT_UNKNOWN
unknown result
+
NM_SETTING_DIFF_RESULT_IN_A
the property is present in setting A
+
NM_SETTING_DIFF_RESULT_IN_B
the property is present in setting B
+

+

+

+

 
nm_setting_diff ()

 
gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
@@ -673,8 +831,11 @@ for a description of each flag's behavior.  If the settings differ, the keys
 of each setting that differ from the other are added to results, mapped to
 one or more NMSettingDiffResult values.
 

-

+

+++
@@ -714,29 +875,6 @@ in and the settings differ, a new one is created and returned. 
-
nm_setting_duplicate ()

-
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

-

-Duplicates a NMSetting.
-

-

 


 
 

 
a :

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


setting :
the NMSetting to duplicate
Returns :
a new NMSetting containing the same properties and values as the
-source NMSetting. [transfer full]
-

-

-

-

 
nm_setting_enumerate_values ()

 
void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
@@ -745,8 +883,11 @@ source NMSetting object, calling the supplied
 user function for each property.
 

-

+

+++
@@ -767,28 +908,18 @@ user function for each property.
 

-
nm_setting_error_quark ()

-
GQuark              nm_setting_error_quark              (void);

-

-Registers an error quark for NMSetting if necessary.
-

-

 


 
 

 
setting :

 
 

--
-
-
-
-


Returns :
the error quark used for NMSetting errors.

-

-

-

-
nm_setting_get_name ()

-
const char *        nm_setting_get_name                 (NMSetting *setting);

+
nm_setting_to_string ()

+
char *              nm_setting_to_string                (NMSetting *setting);

 

-Returns the type name of the NMSetting object
+Convert the setting into a string.  For debugging purposes ONLY, should NOT
+be used for serialization of the setting, or machine-parsed in any way. The
+output format is not guaranteed to be stable and may change at any time.
 

-

+

+++
@@ -797,62 +928,49 @@ Returns the type name of the Returns :

-
+

 


 
 

 
setting :
a string containing the type name of the NMSetting object,
-like 'ppp' or 'wireless' or 'wired'.an allocated string containing a textual representation of the
+setting's properties and values (including secrets!), which the caller should
+free with g_free()
+
 

 
 

 

 

 

-
nm_setting_get_secret_flags ()

-
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);

+
nm_setting_clear_secrets ()

+
void                nm_setting_clear_secrets            (NMSetting *setting);

 

-For a given secret, retrieves the NMSettingSecretFlags describing how to
-handle that secret.
+Resets and clears any secrets in the setting.  Secrets should be added to the
+setting only when needed, and cleared immediately after use to prevent
+leakage of information.
 

-

+

+-
-
++
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 




 
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 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_get_virtual_iface_name ()

-
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

+
nm_setting_clear_secrets_with_flags ()

+
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

 

-Returns the name of the virtual kernel interface which the connection
-needs to use if specified in the settings.
+Clears and frees secrets determined by func.
 

-

+

+++
@@ -860,9 +978,15 @@ needs to use if specified in the settings.
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
Returns :
Name of the virtual interface or NULL if the setting does not
-support this feature
func :
function to be called to determine whether a
+specific secret should be cleared or not. [scope call]
+
user_data :
caller-supplied data passed to func
+
 

 
 

@@ -877,8 +1001,11 @@ 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.
 

-

+

+++
@@ -887,10 +1014,10 @@ is no way to conclusively determine exactly which secrets are needed.
 
-
@@ -898,51 +1025,61 @@ itself with 
-
nm_setting_new_from_hash ()

-
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);

+
nm_setting_update_secrets ()

+
gboolean            nm_setting_update_secrets           (NMSetting *setting,
+                                                         GHashTable *secrets,
+                                                         GError **error);

-Creates a new NMSetting object and populates that object with the properties
-contained in the hash table, using each hash key as the property to set,
-and each hash value as the value to set that property to.  Setting properties
-are strongly typed, thus the GValue type of the hash value must be correct.
-See the documentation on each NMSetting object subclass for the correct
-property names and value types.
+Update the setting's secrets, given a hash table of secrets intended for that
+setting (deserialized from D-Bus for example).
 

-

 


 
 

 
setting :

 

 
Returns :
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(). [transfer full][element-type utf8]
+a GPtrArray containing
+the property names of secrets of the NMSetting which may be required; the
+caller owns the array and must free it with g_ptr_array_free(), but must not
+free the elements. [transfer container][element-type utf8]
 
 

 
 

+

+++
-
-
+
+
-
-
+
+
+
+
+
-
+

 


 
 
setting_type :
the NMSetting type which the hash contains properties for
setting :
the NMSetting
+
 

 
hash :
the GHashTable containing a
-string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]
+
secrets :
a GHashTable mapping
+string to GValue of setting property names and secrets. [element-type utf8 GObject.Value]
+
error :
location to store error, or NULL
 
 

 

 
Returns :
a new NMSetting object populated with the properties from the
-hash table, or NULL on failure
+TRUE if the secrets were successfully updated, FALSE on failure to
+update one or more of the secrets.
 

 
 

 

 

 

-
nm_setting_set_secret_flags ()

-
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+
nm_setting_get_secret_flags ()

+
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);

 

 For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
 

-

+

+++
@@ -951,15 +1088,15 @@ handle that secret.
 
-
+
-
-
+
+
-
@@ -972,47 +1109,20 @@ this setting, and if that property is secret), FALSE if not

-
nm_setting_to_hash ()

-
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
-D-Bus or serializing.  The mapping is string to GValue.
-

-

 


 
 

 
setting :

 

 
secret_name :
the secret key name to set flags forthe secret key name to get flags for
 

 
flags :
the NMSettingSecretFlags for the secret
out_flags :
on success, the NMSettingSecretFlags for the secret
 

 

 
error :
location to store error, or NULL
+location to store error, or NULL
 
 

 

 
 
 

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


setting :
the NMSetting
-
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-
Returns :
a new GHashTable
-describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
-

-

-

-

-
nm_setting_to_string ()

-
char *              nm_setting_to_string                (NMSetting *setting);

+
nm_setting_set_secret_flags ()

+
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags flags,
+                                                         GError **error);

 

-Convert the setting into a string.  For debugging purposes ONLY, should NOT
-be used for serialization of the setting, or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
+For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.
 

-

+

+++
@@ -1020,87 +1130,49 @@ output format is not guaranteed to be stable and may change at any time.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :
an allocated string containing a textual representation of the
-setting's properties and values (including secrets!), which the caller should
-free with g_free()
-

-

-

-

-
nm_setting_update_secrets ()

-
gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);

-

-Update the setting's secrets, given a hash table of secrets intended for that
-setting (deserialized from D-Bus for example).
-

-

--
-
-
-
+
+
-
-
+
+
-
-
+


setting :
the NMSetting
-
secret_name :
the secret key name to set flags for
 

 
secrets :
a GHashTable mapping
-string to GValue of setting property names and secrets. [element-type utf8 GObject.Value]
-
flags :
the NMSettingSecretFlags for the secret
 

 

 
error :
location to store error, or NULL
+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 connectionTRUE 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_verify ()

-
gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);

+
nm_setting_get_virtual_iface_name ()

+
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

 

-Validates the setting.  Each setting's properties have allowed values, and
-some are dependent on other values (hence the need for all_settings).  The
-returned GError contains information about which property of the setting
-failed validation, and in what way that property failed validation.
+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
setting :
the NMSetting to verify
all_settings :
a GSList of all settings
-in the connection from which setting came. [element-type NMSetting]
-
error :
location to store error, or NULL
+the NMSetting
 
 

 

 
Returns :

-TRUE if the setting is valid, FALSE if it is notName of the virtual interface or NULL if the setting does not
+support this feature
 

 
 

@@ -1122,6 +1194,6 @@ example 'ppp' or 'wireless' or 'wired'.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index a81f903d..0078c61b 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -3,12 +3,12 @@
 
 
 NMSetting8021x
-
+
 
 
 
 
-
+
 
 
 
@@ -44,179 +44,179 @@
 
 #include <nm-setting-8021x.h>
 
-                    NMSetting8021x;
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
-                    NMSetting8021xClass;
+#define             NM_SETTING_802_1X_SETTING_NAME
 enum                NMSetting8021xError;
-#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
+#define             NM_SETTING_802_1X_ERROR
+GQuark              nm_setting_802_1x_error_quark       (void);
+#define             NM_SETTING_802_1X_EAP
+#define             NM_SETTING_802_1X_IDENTITY
 #define             NM_SETTING_802_1X_ANONYMOUS_IDENTITY
+#define             NM_SETTING_802_1X_PAC_FILE
 #define             NM_SETTING_802_1X_CA_CERT
 #define             NM_SETTING_802_1X_CA_PATH
+#define             NM_SETTING_802_1X_SUBJECT_MATCH
+#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_CLIENT_CERT
-#define             NM_SETTING_802_1X_EAP
-#define             NM_SETTING_802_1X_ERROR
-#define             NM_SETTING_802_1X_IDENTITY
-#define             NM_SETTING_802_1X_PAC_FILE
-#define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PASSWORD_RAW
-#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
-#define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
-#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
 #define             NM_SETTING_802_1X_PHASE1_PEAPVER
-#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
+#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
+#define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 #define             NM_SETTING_802_1X_PHASE2_AUTH
 #define             NM_SETTING_802_1X_PHASE2_AUTHEAP
 #define             NM_SETTING_802_1X_PHASE2_CA_CERT
 #define             NM_SETTING_802_1X_PHASE2_CA_PATH
+#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
+#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 #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_PASSWORD_RAW
+#define             NM_SETTING_802_1X_PASSWORD_RAW_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_PHASE2_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_PIN
 #define             NM_SETTING_802_1X_PIN_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_SETTING_NAME
-#define             NM_SETTING_802_1X_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
-gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);
+                    NMSetting8021x;
+                    NMSetting8021xClass;
+NMSetting *         nm_setting_802_1x_new               (void);
+guint32             nm_setting_802_1x_get_num_eap_methods
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
+                                                         guint32 i);
 gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);
-gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);
-void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);
-void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
-void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);
-GQuark              nm_setting_802_1x_error_quark       (void);
-const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
+void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
                                                          guint32 i);
+void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (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);
-NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
-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_phase2_ca_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);
-const char *        nm_setting_802_1x_get_identity      (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 *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
 guint32             nm_setting_802_1x_get_num_altsubject_matches
                                                         (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_eap_methods
+const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);
+void                nm_setting_802_1x_remove_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+void                nm_setting_802_1x_clear_altsubject_matches
                                                         (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
+NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_peapver
+const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
 const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (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
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_path
+gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);
+void                nm_setting_802_1x_remove_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+void                nm_setting_802_1x_clear_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_path
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+gboolean            nm_setting_802_1x_set_phase2_client_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         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_phase2_subject_match
+const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (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
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+                                                         const char *key_path,
+                                                         const char *password,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
 const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
 NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_private_key_path
+NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_get_system_ca_certs
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting *         nm_setting_802_1x_new               (void);
-void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
@@ -224,21 +224,16 @@ const char *        NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);
 

 

 

 
Object Hierarchy

-
-  GObject
-   +----NMSetting
-         +----NMSetting8021x
-

 
   GEnum
    +----NMSetting8021xCKFormat
@@ -251,6 +246,11 @@ const char *        
+  GObject
+   +----NMSetting
+         +----NMSetting8021x
+

 

 

 
Properties

@@ -280,6 +280,8 @@ const char *        phase2-private-key-password" gchar*                : Read / Write
   "phase2-private-key-password-flags" guint                 : Read / Write
   "phase2-subject-match"     gchar*                : Read / Write
+  "pin"                      gchar*                : Read / Write
+  "pin-flags"                guint                 : Read / Write
   "private-key"              GArray_guchar_*       : Read / Write
   "private-key-password"     gchar*                : Read / Write
   "private-key-password-flags" guint                 : Read / Write
@@ -321,13 +323,6 @@ following books.
 

 
Details

 

-
NMSetting8021x

-
typedef struct _NMSetting8021x NMSetting8021x;

-

-

-

-

-

 
enum NMSetting8021xCKFormat

 
typedef enum {
  /*< underscore_name=nm_setting_802_1x_ck_format >*/
@@ -341,8 +336,11 @@ following books.
 NMSetting8021xCKFormat values indicate the general type of a certificate
 or private key
 

-

+

+++
@@ -384,8 +382,11 @@ and private key
 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_FORMAT_UNKNOWN

+

+++
@@ -410,16 +411,8 @@ to a file containing the certificate or key data
 

-
NMSetting8021xClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSetting8021xClass;
+
NM_SETTING_802_1X_SETTING_NAME

+
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 

 

 

@@ -434,8 +427,11 @@ to a file containing the certificate or key data
 	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSetting8021xError;
 

-

 


 
 

 
NM_SETTING_802_1X_CK_SCHEME_UNKNOWN

 
 

+

+++
@@ -458,104 +454,114 @@ required
 

-
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
+
NM_SETTING_802_1X_ERROR

+
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 

 

 

 

-
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

-
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
-

+
nm_setting_802_1x_error_quark ()

+
GQuark              nm_setting_802_1x_error_quark       (void);

 

+Registers an error quark for NMSetting8021x if necessary.
 

+

 


 
 

 
NM_SETTING_802_1X_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSetting8021x errors.

 

 

 

-
NM_SETTING_802_1X_CA_CERT

-
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
+
NM_SETTING_802_1X_EAP

+
#define NM_SETTING_802_1X_EAP "eap"
 

 

 

 

 

 

-
NM_SETTING_802_1X_CA_PATH

-
#define NM_SETTING_802_1X_CA_PATH "ca-path"
+
NM_SETTING_802_1X_IDENTITY

+
#define NM_SETTING_802_1X_IDENTITY "identity"
 

 

 

 

 

 

-
NM_SETTING_802_1X_CLIENT_CERT

-
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
+
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

+
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 

 

 

 

 

 

-
NM_SETTING_802_1X_EAP

-
#define NM_SETTING_802_1X_EAP "eap"
+
NM_SETTING_802_1X_PAC_FILE

+
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 

 

 

 

 

 

-
NM_SETTING_802_1X_ERROR

-
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+
NM_SETTING_802_1X_CA_CERT

+
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_IDENTITY

-
#define NM_SETTING_802_1X_IDENTITY "identity"
+
NM_SETTING_802_1X_CA_PATH

+
#define NM_SETTING_802_1X_CA_PATH "ca-path"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PAC_FILE

-
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
+
NM_SETTING_802_1X_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD

-
#define NM_SETTING_802_1X_PASSWORD "password"
+
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_802_1X_CLIENT_CERT

+
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_RAW

-
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
+
NM_SETTING_802_1X_PHASE1_PEAPVER

+
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
+
NM_SETTING_802_1X_PHASE1_PEAPLABEL

+
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

 

 

@@ -570,152 +576,152 @@ required
 

 

 

-
NM_SETTING_802_1X_PHASE1_PEAPLABEL

-
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
+
NM_SETTING_802_1X_PHASE2_AUTH

+
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE1_PEAPVER

-
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
+
NM_SETTING_802_1X_PHASE2_AUTHEAP

+
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
+
NM_SETTING_802_1X_PHASE2_CA_CERT

+
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_AUTH

-
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
+
NM_SETTING_802_1X_PHASE2_CA_PATH

+
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_AUTHEAP

-
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
+
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CA_CERT

-
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
+
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CA_PATH

-
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
+
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

+
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

-
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
+
NM_SETTING_802_1X_PASSWORD

+
#define NM_SETTING_802_1X_PASSWORD "password"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
+
NM_SETTING_802_1X_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
+
NM_SETTING_802_1X_PASSWORD_RAW

+
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
 

 

 

 

 

 

-
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_PASSWORD_RAW_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
+
NM_SETTING_802_1X_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PIN

-
#define NM_SETTING_802_1X_PIN "pin"
+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PIN_FLAGS

-
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+
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_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 

 

 

 

 

 

-
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_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_SETTING_NAME

-
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
+
NM_SETTING_802_1X_PIN

+
#define NM_SETTING_802_1X_PIN "pin"
 

 

 

 

 

 

-
NM_SETTING_802_1X_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
+
NM_SETTING_802_1X_PIN_FLAGS

+
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 

 

 

@@ -730,17 +736,62 @@ required
 

 

 

-
nm_setting_802_1x_add_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);

+
NMSetting8021x

+
typedef struct _NMSetting8021x NMSetting8021x;

+

+

+

+

+

+
NMSetting8021xClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSetting8021xClass;
+

 

-Adds an allowed alternate subject name match.  Until at least one
-match is added, the altSubjectName of the remote authentication
-server is not verified.
 

-

+
+

+

+
nm_setting_802_1x_new ()

+
NMSetting *         nm_setting_802_1x_new               (void);

+

+Creates a new NMSetting8021x object with default values.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMSetting8021x object

+

+

+

+
nm_setting_802_1x_get_num_eap_methods ()

+
guint32             nm_setting_802_1x_get_num_eap_methods
+                                                        (NMSetting8021x *setting);

+

+Returns the number of eap methods allowed for use when connecting to the
+network.  Generally only one EAP method is used.  Use the functions
+nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
+and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
+allowed EAP methods.
+

+

+++
@@ -748,13 +799,39 @@ server is not verified.
 
-
-
+
+
+
+
+

 


 
 

 
setting :

 

 
altsubject_match :
the altSubjectName to allow for this connection
Returns :
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);

+

+Returns the name of the allowed EAP method at index i.
+

+

++++
+
+
+
+
+
+
+
+
-
+




setting :
the NMSetting8021x
+
i :
the index of the EAP method name to return
 

 

 
Returns :
TRUE if the alternative subject name match was
-successfully added, FALSE if it was already allowed.the name of the allowed EAP method at index i
+
 

 
 

@@ -769,8 +846,11 @@ Adds an allowed EAP method.  The setting is not valid until at least one
 EAP method has been added.  See "eap" property for a list of
 allowed EAP methods.
 

-

+

+++
@@ -791,17 +871,17 @@ not a valid method or if it was already allowed.

-
nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);

+
nm_setting_802_1x_remove_eap_method ()

+
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
+                                                         guint32 i);

 

-Adds an allowed alternate subject name match for "phase 2".  Until
-at least one match is added, the altSubjectName of the "phase 2"
-remote authentication server is not verified.
+Removes the allowed EAP method at the specified index.
 

-

 


 
 

 
setting :

 
 
 

+

+++
@@ -809,28 +889,24 @@ remote authentication server is not verified.
 
-
-
-
-
-
-
+
+

 


 
 

 
setting :

 

 
phase2_altsubject_match :
the "phase 2" altSubjectName to allow for this
-connection
Returns :
TRUE if the "phase 2" alternative subject name match was
-successfully added, FALSE if it was already allowed.
i :
the index of the EAP method to remove
 

 
 

 

 

 

-
nm_setting_802_1x_clear_altsubject_matches ()

-
void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_clear_eap_methods ()

+
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

 

-Clears all altSubjectName matches.
+Clears all allowed EAP methods.
 

-

+

+++
nm_setting_802_1x_get_phase1_peaplabel ()
const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);

-

 


 

 
setting :

 the NMSetting8021x
@@ -840,77 +916,26 @@ Clears all altSubjectName matches.
 
 

 

-
nm_setting_802_1x_clear_eap_methods ()

-
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

+
nm_setting_802_1x_get_identity ()

+
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

 

-Clears all allowed EAP methods.
+Returns the identifier used by some EAP methods (like TLS) to
+authenticate the user.  Often this is a username or login name.
 

-

+

+-
++
+
+
-
-

 




 
setting :

 the NMSetting8021x
 

-

-

-

-
nm_setting_802_1x_clear_phase2_altsubject_matches ()

-
void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Clears all "phase 2" altSubjectName matches.
-

-

--
-
-
-
-


setting :
the NMSetting8021x
-

-

-

-

-
nm_setting_802_1x_error_quark ()

-
GQuark              nm_setting_802_1x_error_quark       (void);

-

-Registers an error quark for NMSetting8021x if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSetting8021x errors.

-

-

-

-
nm_setting_802_1x_get_altsubject_match ()

-
const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the altSubjectName match at index i.
-

-

--
-
-
-
-
-
-
-
-
+


setting :
the NMSettingConnection
-
i :
the zero-based index of the array of altSubjectName matches
 

 

 
Returns :
the altSubjectName match at index i
-the user identifier
 

 
 

@@ -926,8 +951,11 @@ authenticate the user in the outer unencrypted "phase 1" authentication.  The
 inner "phase 2" authentication will use the "identity" in
 a secure form, if applicable for that EAP method.
 

-

+

+++
@@ -943,18 +971,16 @@ a secure form, if applicable for that EAP method.
 

-
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

+
nm_setting_802_1x_get_pac_file ()

+
const char *        nm_setting_802_1x_get_pac_file      (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
-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.
+Returns the file containing PAC credentials used by EAP-FAST method.
 

-

 


 
 

 
setting :

 
 

+

+++
@@ -963,25 +989,29 @@ of the network cannot be confirmed by the client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the CA certificate datathe PAC file
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

+
nm_setting_802_1x_get_system_ca_certs ()

+
gboolean            nm_setting_802_1x_get_system_ca_certs
+                                                        (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
-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.
+Sets the "system-ca-certs" property. The
+"ca-path" and "phase2-ca-path"
+properties are ignored if the "system-ca-certs" property is
+TRUE, in which case a system-wide CA certificate directory specified at
+compile time (using the --system-ca-path configure option) is used in place
+of these properties.
 

-

+

+++
@@ -990,23 +1020,27 @@ of the network cannot be confirmed by the client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the CA certificate fileTRUE if a system CA certificate path should be used, FALSE if not
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_path ()

+
const char *        nm_setting_802_1x_get_ca_path       (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().
+Returns the path of the CA certificate directory if previously set.  Systems
+will often have a directory that contains multiple individual CA certificates
+which the supplicant can then add to the verification chain.  This may be
+used in addition to the "ca-cert" property to add more CA
+certificates for verifying the network to client.
 

-

+

+++
@@ -1015,24 +1049,28 @@ if Returns :

-
+

 


 
 

 
setting :
scheme used to store the CA certificate (blob or path)the CA certificate directory path
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_path ()

-
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

+
nm_setting_802_1x_get_phase2_ca_path ()

+
const char *        nm_setting_802_1x_get_phase2_ca_path
+                                                        (NMSetting8021x *setting);

 

-Returns the path of the CA certificate directory if previously set.  Systems
-will often have a directory that contains multiple individual CA certificates
-which the supplicant can then add to the verification chain.  This may be
-used in addition to the "ca-cert" property to add more CA
-certificates for verifying the network to client.
+Returns the path of the "phase 2" CA certificate directory if previously set.
+Systems will often have a directory that contains multiple individual CA
+certificates which the supplicant can then add to the verification chain.
+This may be used in addition to the "phase2-ca-cert" property
+to add more CA certificates for verifying the network to client.
 

-

+

+++
@@ -1041,23 +1079,26 @@ certificates for verifying the network to client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the CA certificate directory paththe "phase 2" CA certificate directory path
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
+
nm_setting_802_1x_get_ca_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

-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.
+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().
 

-

+

+++
@@ -1066,23 +1107,28 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the client certificate datascheme used to store the CA certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_path ()

-
const char *        nm_setting_802_1x_get_client_cert_path
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

 

-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.
+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.
 

-

+

+++
@@ -1091,23 +1137,28 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the client certificate filethe CA certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_cert_path ()

+
const char *        nm_setting_802_1x_get_ca_cert_path  (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().
+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
+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.
 

-

+

+++
@@ -1116,21 +1167,30 @@ if Returns :

-
+

 


 
 

 
setting :
scheme used to store the client certificate (blob or path)path to the CA certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_eap_method ()

-
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);

+
nm_setting_802_1x_set_ca_cert ()

+
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-Returns the name of the allowed EAP method at index i.
+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
+scheme, or with the path to the certificate file if using the
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

-

+

+++
@@ -1138,27 +1198,41 @@ Returns the name of the allowed EAP method at index 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :

 
i :
the index of the EAP method name to return
cert_path :
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
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error
 

 

 
Returns :
the name of the allowed EAP method at index i
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_identity ()

-
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

-

-Returns the identifier used by some EAP methods (like TLS) to
-authenticate the user.  Often this is a username or login name.
-

-

+
nm_setting_802_1x_get_subject_match ()

+
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

+

+++
@@ -1167,7 +1241,10 @@ authenticate the user.  Often this is a username or login name.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the user identifierthe "subject-match" property. This is the
+substring to be matched against the subject of the authentication
+server certificate, or NULL no subject verification is to be
+performed.
 

 
 

@@ -1181,8 +1258,11 @@ authenticate the user.  Often this is a username or login name.
 Returns the number of entries in the
 "altsubject-matches" property of this setting.
 

-

+

+++
@@ -1198,42 +1278,52 @@ Returns the number of entries in the
 

-
nm_setting_802_1x_get_num_eap_methods ()

-
guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_altsubject_match ()

+
const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-Returns the number of eap methods allowed for use when connecting to the
-network.  Generally only one EAP method is used.  Use the functions
-nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
-and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
-allowed EAP methods.
+Returns the altSubjectName match at index i.
 

-

 


 
 

 
setting :

 
 

+

+++
-
+
+
+
+
-
+

 


 
 

 
setting :
the NMSetting8021x
+the NMSettingConnection
 
 

 
i :
the zero-based index of the array of altSubjectName matches

 
Returns :
the number of allowed EAP methodsthe altSubjectName match at index i
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_add_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);

 

-Returns the number of entries in the
-"phase2-altsubject-matches" property of this setting.
+Adds an allowed alternate subject name match.  Until at least one
+match is added, the altSubjectName of the remote authentication
+server is not verified.
 

-

+

+++
@@ -1241,21 +1331,31 @@ Returns the number of entries in the
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
altsubject_match :
the altSubjectName to allow for this connection

 
Returns :
the number of phase2-altsubject-matches entries.TRUE if the alternative subject name match was
+successfully added, FALSE if it was already allowed.
 

 
 

 

 

 

-
nm_setting_802_1x_get_pac_file ()

-
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

-

-Returns the file containing PAC credentials used by EAP-FAST method.
-

-

+
nm_setting_802_1x_remove_altsubject_match ()

+
void                nm_setting_802_1x_remove_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

+

+Removes the allowed altSubjectName at the specified index.
+

+

+++
@@ -1263,18 +1363,47 @@ Returns the file containing PAC credentials used by EAP-FAST method.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the PAC file
i :
the index of the altSubjectName match to remove
 

 
 

 

 

 

-
nm_setting_802_1x_get_password ()

-
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

-

+
nm_setting_802_1x_clear_altsubject_matches ()

+
void                nm_setting_802_1x_clear_altsubject_matches
+                                                        (NMSetting8021x *setting);

+

+Clears all altSubjectName matches.
+

+

++++
+
+
+
+
+




setting :
the NMSetting8021x
+

+

+

+

+
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().
+

+

+++
@@ -1283,19 +1412,26 @@ Returns the file containing PAC credentials used by EAP-FAST method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the password used by the authentication method, if any, as specified
-by the "password" propertyscheme used to store the client certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+
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
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1304,18 +1440,26 @@ by the 
 
-
+

 


 
 

 
setting :

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
-the client certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_raw ()

-
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

-

+
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
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1324,20 +1468,35 @@ by the 
 
-
+

 


 
 

 
setting :

 
Returns :
the password used by the authentication method as a
-UTF-8-encoded array of bytes, as specified by the
-"password-raw" propertypath to the client certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_raw_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_set_client_cert ()

+
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

+

+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.
+

+

+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.
+

+

+++
@@ -1345,21 +1504,42 @@ UTF-8-encoded array of bytes, as specified by the
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :

 

 
cert_path :
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
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error

 
Returns :
the NMSettingSecretFlags pertaining to the
-"password-raw"
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase1_fast_provisioning ()

-
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+
nm_setting_802_1x_get_phase1_peapver ()

+
const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);

-

+

+++
@@ -1368,9 +1548,9 @@ UTF-8-encoded array of bytes, as specified by the
 
-
+

 


 
 

 
setting :

 

 
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.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).
 

 
 

@@ -1380,8 +1560,11 @@ wpa_supplicant documentation for more details.

 
 

+

+++
@@ -1392,7 +1575,7 @@ wpa_supplicant documentation for more details.
@@ -1401,11 +1584,14 @@ wpa_supplicant documentation for more details.

-
nm_setting_802_1x_get_phase1_peapver ()

-
const char *        nm_setting_802_1x_get_phase1_peapver
+
nm_setting_802_1x_get_phase1_fast_provisioning ()

+
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);

-

 


 
 

 
setting :

 
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),
+"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.
 

 
 
 

+

+++
@@ -1414,48 +1600,46 @@ wpa_supplicant documentation for more details.
-
+

 


 
 

 
setting :

 

 

 
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).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_altsubject_match ()

-
const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the "phase 2" altSubjectName match at index i.
-

-

+
nm_setting_802_1x_get_phase2_auth ()

+
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

+

+++
-
-
-
-
-
-
+

 


 
 

 
setting :
the NMSettingConnection
+the NMSetting8021x
 
 

 
i :
the zero-based index of the array of "phase 2" altSubjectName matches

 
Returns :
the "phase 2" altSubjectName match at index i
-the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the "phase2-auth" property.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_auth ()

-
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_autheap ()

+
const char *        nm_setting_802_1x_get_phase2_autheap
+                                                        (NMSetting8021x *setting);

+

+++
@@ -1464,19 +1648,28 @@ Returns the "phase 2" altSubjectName match at index 
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the "phase2-auth" property.the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the "phase2-autheap" property.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_autheap ()

-
const char *        nm_setting_802_1x_get_phase2_autheap
+
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,
+use nm_setting_802_1x_get_ca_cert_path().
+

+

+++
@@ -1485,8 +1678,7 @@ specified by the Returns :

-
+

 


 
 

 
setting :
the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.scheme used to store the "phase 2" CA certificate (blob or path)
 

 
 

@@ -1504,8 +1696,11 @@ 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.
 

-

+

+++
@@ -1532,8 +1727,11 @@ 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 :

+

+++
@@ -1549,17 +1747,24 @@ of the network cannot be confirmed by the client.
 

-
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_set_phase2_ca_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-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,
-use nm_setting_802_1x_get_ca_cert_path().
+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.
 

-

 


 
 

 
setting :

 
 

+

+++
@@ -1567,26 +1772,42 @@ use cert_path :

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :
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
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error

 
Returns :
scheme used to store the "phase 2" CA certificate (blob or path)TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_ca_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_path
+
nm_setting_802_1x_get_phase2_subject_match ()

+
const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);

-

-Returns the path of the "phase 2" CA certificate directory if previously set.
-Systems will often have a directory that contains multiple individual CA
-certificates which the supplicant can then add to the verification chain.
-This may be used in addition to the "phase2-ca-cert" property
-to add more CA certificates for verifying the network to client.
-

-

+

+++
@@ -1595,23 +1816,28 @@ to add more CA certificates for verifying the network to client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" CA certificate directory paththe "phase2-subject-match" property. This is
+the substring to be matched against the subject of the "phase 2"
+authentication server certificate, or NULL no subject verification
+is to be performed.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

+
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);

 

-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.
+Returns the number of entries in the
+"phase2-altsubject-matches" property of this setting.
 

-

+

+++
@@ -1620,50 +1846,59 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" client certificate datathe number of phase2-altsubject-matches entries.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_phase2_altsubject_match ()

+
const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-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.
+Returns the "phase 2" altSubjectName match at index i.
 

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
setting :
the NMSetting8021x
+the NMSettingConnection
 
 

 
i :
the zero-based index of the array of "phase 2" altSubjectName matches

 
Returns :
path to the "phase 2" client certificate filethe "phase 2" altSubjectName match at index i
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_add_phase2_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);

 

-Returns the scheme used to store the "phase 2" 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().
+Adds an allowed alternate subject name match for "phase 2".  Until
+at least one match is added, the altSubjectName of the "phase 2"
+remote authentication server is not verified.
 

-

+

+++
@@ -1671,29 +1906,32 @@ returned scheme is phase2_altsubject_match :

+
+
+
-
+

 


 
 

 
setting :
the "phase 2" altSubjectName to allow for this
+connection

 
Returns :
scheme used to store the "phase 2" client certificate (blob or path)TRUE if the "phase 2" alternative subject name match was
+successfully added, FALSE if it was already allowed.
 

 
 

 

 

 

-
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.
-

+
nm_setting_802_1x_remove_phase2_altsubject_match ()

+
void                nm_setting_802_1x_remove_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-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.
+Removes the allowed "phase 2" altSubjectName at the specified index.
 

-

+

+++
@@ -1701,40 +1939,49 @@ keys should always be encrypted with a private key password.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" private key data
i :
the index of the "phase 2" altSubjectName match to remove
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+
nm_setting_802_1x_clear_phase2_altsubject_matches ()

+
void                nm_setting_802_1x_clear_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);

-

+

+Clears all "phase 2" altSubjectName matches.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSetting8021x
 
Returns :
the data format of the "phase 2" private key data stored in the
-"phase2-private-key" property

 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_password
+
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
+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().
+

+

+++
@@ -1743,20 +1990,26 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_phase2_private_key() or the
-"phase2-private-key-password" property.scheme used to store the "phase 2" client certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+
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
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1765,25 +2018,26 @@ previously set with Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the
-"phase2-private-key-password"
-the "phase 2" client certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_path
+
nm_setting_802_1x_get_phase2_client_cert_path ()

+
const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);

 

-Private keys are used to authenticate the connecting client to the network
+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.
 

-

+

+++
@@ -1792,25 +2046,36 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the "phase 2" private key filepath to the "phase 2" client certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_set_phase2_client_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_client_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-Returns the scheme used to store the "phase 2" private key.  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().
+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.
+

+

+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.
 

-

+

+++
@@ -1818,61 +2083,41 @@ scheme is Returns :

-
+
+
-
-

 


 
 

 
setting :
scheme used to store the "phase 2" private key (blob or path)
cert_path :
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.
 

-

-

-

-
nm_setting_802_1x_get_phase2_subject_match ()

-
const char *        nm_setting_802_1x_get_phase2_subject_match
-                                                        (NMSetting8021x *setting);

-

--
-
-
+
+
-
-
+
+
-
-


 
setting :
the NMSetting8021x
-
scheme :
desired storage scheme for the certificate
 

 
Returns :
the "phase2-subject-match" property. This is
-the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
-is to be performed.
out_format :
on successful return, the type of the certificate added
 

-

-

-

-
nm_setting_802_1x_get_pin ()

-
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

-

--
-
-
+
+
-
+


 
setting :
the NMSetting8021x
-
error :
on unsuccessful return, an error
 

 

 
Returns :
the PIN used by the authentication method, if any, as specified
-by the "pin" propertyTRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password ()

+
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

+

+++
@@ -1881,30 +2126,22 @@ by the "pin" property
-
+

 


 
 

 
setting :

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"pin"
-the password used by the authentication method, if any, as specified
+by the "password" property
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_private_key_blob
+
nm_setting_802_1x_get_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (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.
-

-

+

+++
@@ -1913,18 +2150,21 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key datathe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password_raw ()

+
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

+

+++
@@ -1933,19 +2173,23 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the data format of the private key data stored in the
-"private-key" propertythe password used by the authentication method as a
+UTF-8-encoded array of bytes, as specified by the
+"password-raw" property
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_password ()

-
const char *        nm_setting_802_1x_get_private_key_password
+
nm_setting_802_1x_get_password_raw_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);

-

+

+++
@@ -1954,20 +2198,22 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_private_key(), or the
-"private-key-password" property.the NMSettingSecretFlags pertaining to the
+"password-raw"
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_pin ()

+
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

+

+++
@@ -1976,25 +2222,21 @@ previously set with Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the
-"private-key-password"
-the PIN used by the authentication method, if any, as specified
+by the "pin" property
 

 
 

 

 

 

-
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
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+
nm_setting_802_1x_get_pin_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

+

+++
@@ -2003,7 +2245,9 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the private key filethe NMSettingSecretFlags pertaining to the
+"pin"
+
 

 
 

@@ -2020,8 +2264,11 @@ Returns the scheme used to store the private key.  If the returned scheme is
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

-

+

+++
@@ -2037,103 +2284,24 @@ Returns the scheme used to store the private key.  If the returned scheme is
 

-
nm_setting_802_1x_get_subject_match ()

-
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

-

 


 
 

 
setting :

 
 

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


setting :
the NMSetting8021x
-
Returns :
the "subject-match" property. This is the
-substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
-performed.

-

-

-

-
nm_setting_802_1x_get_system_ca_certs ()

-
gboolean            nm_setting_802_1x_get_system_ca_certs
+
nm_setting_802_1x_get_private_key_blob ()

+
const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);

 

-Sets the "system-ca-certs" property. The
-"ca-path" and "phase2-ca-path"
-properties are ignored if the "system-ca-certs" property is
-TRUE, in which case a system-wide CA certificate directory specified at
-compile time (using the --system-ca-path configure option) is used in place
-of these properties.
-

-

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


setting :
the NMSetting8021x
-
Returns :
TRUE if a system CA certificate path should be used, FALSE if not

-

-

-

-
nm_setting_802_1x_new ()

-
NMSetting *         nm_setting_802_1x_new               (void);

-

-Creates a new NMSetting8021x object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSetting8021x object

-

-

-

-
nm_setting_802_1x_remove_altsubject_match ()

-
void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Removes the allowed altSubjectName at the specified index.
+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
-
i :
the index of the altSubjectName match to remove

-

-

-

-
nm_setting_802_1x_remove_eap_method ()

-
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);

 

-Removes the allowed EAP method at the specified index.
+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.
 

-

+

+++
@@ -2141,23 +2309,27 @@ Removes the allowed EAP method at the specified index.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of the EAP method to remove
Returns :
the private key data
 

 
 

 

 

 

-
nm_setting_802_1x_remove_phase2_altsubject_match ()

-
void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

+
nm_setting_802_1x_get_private_key_path ()

+
const char *        nm_setting_802_1x_get_private_key_path
+                                                        (NMSetting8021x *setting);

 

-Removes the allowed "phase 2" altSubjectName at the specified index.
+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.
 

-

+

+++
@@ -2165,82 +2337,52 @@ Removes the allowed "phase 2" altSubjectName at the specified index.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of the "phase 2" altSubjectName match to remove
Returns :
path to the private key file
 

 
 

 

 

 

-
nm_setting_802_1x_set_ca_cert ()

-
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
+
nm_setting_802_1x_set_private_key ()

+
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+                                                         const char *key_path,
+                                                         const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          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
-scheme, or with the path to the certificate 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.
 

-

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


setting :
the NMSetting8021x
-
cert_path :
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
out_format :
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_set_client_cert ()

-
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

 

-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.
+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.
 

 

-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.
+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.
 

-

+

+++
@@ -2248,20 +2390,26 @@ authentication method.
 
-
-
+
+
+
+
+
+
-
+
-
+
@@ -2276,21 +2424,14 @@ any scheme clears the client certificate
 

-
nm_setting_802_1x_set_phase2_ca_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-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.
-

-

 


 
 

 
setting :

 

 
cert_path :
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.
key_path :
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, 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 certificatedesired storage scheme for the private key
 

 

 
out_format :
on successful return, the type of the certificate addedon successful return, the type of the private key added
 

 

 
error :

 
 

+
nm_setting_802_1x_get_private_key_password ()

+
const char *        nm_setting_802_1x_get_private_key_password
+                                                        (NMSetting8021x *setting);

+

+++
@@ -2298,54 +2439,80 @@ file if using the cert_path :

-
+
+
+
+

 


 
 

 
setting :
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.
Returns :
the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_private_key(), 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);

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the certificate
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the certificate added
Returns :
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);

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulthe data format of the private key data stored in the
+"private-key" property
 

 
 

 

 

 

-
nm_setting_802_1x_set_phase2_client_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-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_get_phase2_private_key_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+                                                        (NMSetting8021x *setting);

 

-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.
+Returns the scheme used to store the "phase 2" private key.  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().
 

-

+

+++
@@ -2353,28 +2520,69 @@ authentication method.
 
-
-
+
+
+
+

 


 
 

 
setting :

 

 
cert_path :
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.
Returns :
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
+                                                        (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.
+

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the certificate
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the certificate added
Returns :
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
+                                                        (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.
+

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulpath to the "phase 2" private key file
 

 
 

@@ -2415,8 +2623,11 @@ 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.
 

-

+

+++
@@ -2428,12 +2639,12 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
@@ -2458,41 +2669,14 @@ an error is returned.

-
nm_setting_802_1x_set_private_key ()

-
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-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.
-

-

 


 
 

 
setting :
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
+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, or NULL if the password
+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.
 

 
 
 

+
nm_setting_802_1x_get_phase2_private_key_password ()

+
const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);

+

+++
@@ -2500,34 +2684,59 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
-
-
-
-
-
+
+
+
+

 


 
 

 
setting :

 

 
key_path :
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, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.
Returns :
the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_phase2_private_key() or the
+"phase2-private-key-password" property.
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the private key
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the private key added
Returns :
the NMSettingSecretFlags pertaining to the
+"phase2-private-key-password"
+
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulthe data format of the "phase 2" private key data stored in the
+"phase2-private-key" property
 

 
 

@@ -2825,6 +3034,25 @@ authentication server certificate's subject is performed.
 

 

 

+
The "pin" property

+
  "pin"                      gchar*                : Read / Write

+

+PIN used for EAP authentication methods.
+

+
Default value: NULL

+

+

+

+
The "pin-flags" property

+
  "pin-flags"                guint                 : Read / Write

+

+Flags indicating how to handle "pin":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "private-key" property

 
  "private-key"              GArray_guchar_*       : Read / Write

 

@@ -2894,6 +3122,6 @@ and 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index c7289a0a..761094b9 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -3,12 +3,12 @@
 
 
 NMSettingAdsl
-
+
 
 
 
 
-
+
 
 
 
@@ -44,45 +44,45 @@
 
 #include <nm-setting-adsl.h>
 
-                    NMSettingAdsl;
-                    NMSettingAdslClass;
+#define             NM_SETTING_ADSL_SETTING_NAME
 enum                NMSettingAdslError;
-#define             NM_SETTING_ADSL_ENCAPSULATION
-#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
-#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 #define             NM_SETTING_ADSL_ERROR
+GQuark              nm_setting_adsl_error_quark         (void);
+#define             NM_SETTING_ADSL_USERNAME
 #define             NM_SETTING_ADSL_PASSWORD
 #define             NM_SETTING_ADSL_PASSWORD_FLAGS
 #define             NM_SETTING_ADSL_PROTOCOL
-#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
+#define             NM_SETTING_ADSL_ENCAPSULATION
+#define             NM_SETTING_ADSL_VPI
+#define             NM_SETTING_ADSL_VCI
 #define             NM_SETTING_ADSL_PROTOCOL_PPPOA
 #define             NM_SETTING_ADSL_PROTOCOL_PPPOE
-#define             NM_SETTING_ADSL_SETTING_NAME
-#define             NM_SETTING_ADSL_USERNAME
-#define             NM_SETTING_ADSL_VCI
-#define             NM_SETTING_ADSL_VPI
-GQuark              nm_setting_adsl_error_quark         (void);
-const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
+#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
+#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
+                    NMSettingAdsl;
+                    NMSettingAdslClass;
+NMSetting *         nm_setting_adsl_new                 (void);
+const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
 const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);
-NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);
-const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
-guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
+const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
 guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);
-NMSetting *         nm_setting_adsl_new                 (void);
+guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
+NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingAdslError
+

 
   GObject
    +----NMSetting
          +----NMSettingAdsl
 

-
-  GEnum
-   +----NMSettingAdslError
-

 

 

 
Properties

@@ -106,23 +106,8 @@ properties of ADSL connections.
 

 
Details

 

-
NMSettingAdsl

-
typedef struct _NMSettingAdsl NMSettingAdsl;

-

-

-

-

-

-
NMSettingAdslClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingAdslClass;
+
NM_SETTING_ADSL_SETTING_NAME

+
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 

 

 

@@ -136,8 +121,11 @@ properties of ADSL connections.
 	NM_SETTING_ADSL_ERROR_MISSING_PROPERTY          /*< nick=MissingProperty >*/
 } NMSettingAdslError;
 

-

+

+++
@@ -160,64 +148,82 @@ required
 

-
NM_SETTING_ADSL_ENCAPSULATION

-
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
+
NM_SETTING_ADSL_ERROR

+
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
 

 

 

 

-
NM_SETTING_ADSL_ENCAPSULATION_LLC

-
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
+
nm_setting_adsl_error_quark ()

+
GQuark              nm_setting_adsl_error_quark         (void);

+

+Registers an error quark for NMSettingAdsl if necessary.
+

+

 


 
 

 
NM_SETTING_ADSL_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingAdsl errors.

+

+

+

+
NM_SETTING_ADSL_USERNAME

+
#define NM_SETTING_ADSL_USERNAME            "username"
 

 

 

 

 

 

-
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

-
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
+
NM_SETTING_ADSL_PASSWORD

+
#define NM_SETTING_ADSL_PASSWORD            "password"
 

 

 

 

 

 

-
NM_SETTING_ADSL_ERROR

-
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
+
NM_SETTING_ADSL_PASSWORD_FLAGS

+
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PASSWORD

-
#define NM_SETTING_ADSL_PASSWORD            "password"
+
NM_SETTING_ADSL_PROTOCOL

+
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PASSWORD_FLAGS

-
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
+
NM_SETTING_ADSL_ENCAPSULATION

+
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PROTOCOL

-
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
+
NM_SETTING_ADSL_VPI

+
#define NM_SETTING_ADSL_VPI                 "vpi"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PROTOCOL_IPOATM

-
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
+
NM_SETTING_ADSL_VCI

+
#define NM_SETTING_ADSL_VCI                 "vci"
 

 

 

@@ -240,57 +246,78 @@ required
 

 

 

-
NM_SETTING_ADSL_SETTING_NAME

-
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
+
NM_SETTING_ADSL_PROTOCOL_IPOATM

+
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 

 

 

 

 

 

-
NM_SETTING_ADSL_USERNAME

-
#define NM_SETTING_ADSL_USERNAME            "username"
+
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

+
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 

 

 

 

 

 

-
NM_SETTING_ADSL_VCI

-
#define NM_SETTING_ADSL_VCI                 "vci"
+
NM_SETTING_ADSL_ENCAPSULATION_LLC

+
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 

 

 

 

 

 

-
NM_SETTING_ADSL_VPI

-
#define NM_SETTING_ADSL_VPI                 "vpi"
+
NMSettingAdsl

+
typedef struct _NMSettingAdsl NMSettingAdsl;

+

+

+

+

+

+
NMSettingAdslClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingAdslClass;
 

 

 

 

 

 

-
nm_setting_adsl_error_quark ()

-
GQuark              nm_setting_adsl_error_quark         (void);

+
nm_setting_adsl_new ()

+
NMSetting *         nm_setting_adsl_new                 (void);

 

-Registers an error quark for NMSettingAdsl if necessary.
+Creates a new NMSettingAdsl object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingAdsl errors.the new empty NMSettingAdsl object
 

 

 

 

 

-
nm_setting_adsl_get_encapsulation ()

-
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_username ()

+
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

+

+++
@@ -299,7 +326,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "encapsulation" property of the settingthe "username" property of the setting
 

 
 

@@ -308,8 +335,11 @@ Registers an error quark for 
 
nm_setting_adsl_get_password ()

 
const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);

-

+

+++
@@ -325,10 +355,13 @@ Registers an error quark for 
-
nm_setting_adsl_get_password_flags ()

-
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

-

 


 
 

 
setting :

+
nm_setting_adsl_get_protocol ()

+
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

+

+++
@@ -337,18 +370,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "protocol" property of the setting
 

 
 

 

 

 

-
nm_setting_adsl_get_protocol ()

-
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_encapsulation ()

+
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

+

+++
@@ -357,17 +392,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "protocol" property of the settingthe "encapsulation" property of the setting
 

 
 

 

 

 

-
nm_setting_adsl_get_username ()

-
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_vpi ()

+
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

+

+++
@@ -376,7 +414,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe "vpi" property of the setting
 

 
 

@@ -385,8 +423,11 @@ Registers an error quark for 
 
nm_setting_adsl_get_vci ()

 
guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);

-

+

+++
@@ -402,10 +443,13 @@ Registers an error quark for 
-
nm_setting_adsl_get_vpi ()

-
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

-

 


 
 

 
setting :

+
nm_setting_adsl_get_password_flags ()

+
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

+

+++
@@ -414,26 +458,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "vpi" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_adsl_new ()

-
NMSetting *         nm_setting_adsl_new                 (void);

-

-Creates a new NMSettingAdsl object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingAdsl object

-

 

 

 
Property Details

@@ -506,6 +536,6 @@ ADSL connection vpi.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index e2f39011..388ae5e7 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBluetooth
-
+
 
 
 
 
-
+
 
 
 
@@ -44,33 +44,33 @@
 
 #include <nm-setting-bluetooth.h>
 
-                    NMSettingBluetooth;
-                    NMSettingBluetoothClass;
+#define             NM_SETTING_BLUETOOTH_SETTING_NAME
 enum                NMSettingBluetoothError;
-#define             NM_SETTING_BLUETOOTH_BDADDR
 #define             NM_SETTING_BLUETOOTH_ERROR
-#define             NM_SETTING_BLUETOOTH_SETTING_NAME
+GQuark              nm_setting_bluetooth_error_quark    (void);
+#define             NM_SETTING_BLUETOOTH_BDADDR
 #define             NM_SETTING_BLUETOOTH_TYPE
 #define             NM_SETTING_BLUETOOTH_TYPE_DUN
 #define             NM_SETTING_BLUETOOTH_TYPE_PANU
-GQuark              nm_setting_bluetooth_error_quark    (void);
+                    NMSettingBluetooth;
+                    NMSettingBluetoothClass;
+NMSetting *         nm_setting_bluetooth_new            (void);
 const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);
 const char *        nm_setting_bluetooth_get_connection_type
                                                         (NMSettingBluetooth *setting);
-NMSetting *         nm_setting_bluetooth_new            (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBluetoothError
+

 
   GObject
    +----NMSetting
          +----NMSettingBluetooth
 

-
-  GEnum
-   +----NMSettingBluetoothError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ Point (NAP) profiles.
 

 
Details

 

-
NMSettingBluetooth

-
typedef struct _NMSettingBluetooth NMSettingBluetooth;

-

-

-

-

-

-
NMSettingBluetoothClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBluetoothClass;
+
NM_SETTING_BLUETOOTH_SETTING_NAME

+
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

 

 

@@ -122,8 +107,11 @@ Point (NAP) profiles.
 	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
 } NMSettingBluetoothError;
 

-

+

+++
@@ -153,24 +141,34 @@ must also contain an 
-
NM_SETTING_BLUETOOTH_BDADDR

-
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
+
NM_SETTING_BLUETOOTH_ERROR

+
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 

 

 

 
 

 

-
NM_SETTING_BLUETOOTH_ERROR

-
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
-

+
nm_setting_bluetooth_error_quark ()

+
GQuark              nm_setting_bluetooth_error_quark    (void);

 

+Registers an error quark for NMSettingBluetooth if necessary.
 

+

 


 
 

 
NM_SETTING_BLUETOOTH_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBluetooth errors.

 

 

 

-
NM_SETTING_BLUETOOTH_SETTING_NAME

-
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
+
NM_SETTING_BLUETOOTH_BDADDR

+
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

 

 

@@ -205,16 +203,43 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
 

 

 

-
nm_setting_bluetooth_error_quark ()

-
GQuark              nm_setting_bluetooth_error_quark    (void);

+
NMSettingBluetooth

+
typedef struct _NMSettingBluetooth NMSettingBluetooth;

+

+

+

+

+

+
NMSettingBluetoothClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBluetoothClass;
+

 

-Registers an error quark for NMSettingBluetooth if necessary.
 

-

+
+

+

+
nm_setting_bluetooth_new ()

+
NMSetting *         nm_setting_bluetooth_new            (void);

+

+Creates a new NMSettingBluetooth object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBluetooth errors.the new empty NMSettingBluetooth object. [transfer full]
+
 

 

 

@@ -226,8 +251,11 @@ Registers an error quark for 
-

+

+++
@@ -250,8 +278,11 @@ describes a connection to.
 Returns the connection method for communicating with the remote device (i.e.
 either DUN to a DUN-capable device or PANU to a NAP-capable device).
 

-

 


 
 

 
setting :

+

+++
@@ -266,22 +297,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
 

 


 
 

 
setting :

 

 

-

-

-
nm_setting_bluetooth_new ()

-
NMSetting *         nm_setting_bluetooth_new            (void);

-

-Creates a new NMSettingBluetooth object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBluetooth object. [transfer full]
-

-

 

 

 
Property Details

@@ -306,6 +321,6 @@ Area Networking connections to devices supporting the NAP profile.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index ff77e102..89c6fe25 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBond
-
+
 
 
 
 
-
+
 
 
 
@@ -44,23 +44,21 @@
 
 #include <nm-setting-bond.h>
 
-                    NMSettingBond;
-                    NMSettingBondClass;
+#define             NM_SETTING_BOND_SETTING_NAME
 enum                NMSettingBondError;
 #define             NM_SETTING_BOND_ERROR
+GQuark              nm_setting_bond_error_quark         (void);
 #define             NM_SETTING_BOND_INTERFACE_NAME
 #define             NM_SETTING_BOND_OPTIONS
-#define             NM_SETTING_BOND_OPTION_ARP_INTERVAL
-#define             NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-#define             NM_SETTING_BOND_OPTION_DOWNDELAY
-#define             NM_SETTING_BOND_OPTION_MIIMON
 #define             NM_SETTING_BOND_OPTION_MODE
+#define             NM_SETTING_BOND_OPTION_MIIMON
+#define             NM_SETTING_BOND_OPTION_DOWNDELAY
 #define             NM_SETTING_BOND_OPTION_UPDELAY
-#define             NM_SETTING_BOND_SETTING_NAME
-gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);
-GQuark              nm_setting_bond_error_quark         (void);
+#define             NM_SETTING_BOND_OPTION_ARP_INTERVAL
+#define             NM_SETTING_BOND_OPTION_ARP_IP_TARGET
+                    NMSettingBond;
+                    NMSettingBondClass;
+NMSetting *         nm_setting_bond_new                 (void);
 const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);
 guint32             nm_setting_bond_get_num_options     (NMSettingBond *setting);
 gboolean            nm_setting_bond_get_option          (NMSettingBond *setting,
@@ -69,25 +67,27 @@ const char *        const char **out_value);
 const char *        nm_setting_bond_get_option_by_name  (NMSettingBond *setting,
                                                          const char *name);
-const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
+gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
+                                                         const char *name,
+                                                         const char *value);
+gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
                                                          const char *name);
 const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);
-NMSetting *         nm_setting_bond_new                 (void);
-gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
                                                          const char *name);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBondError
+

 
   GObject
    +----NMSetting
          +----NMSettingBond
 

-
-  GEnum
-   +----NMSettingBondError
-

 

 

 
Properties

@@ -106,23 +106,8 @@ necessary for bond connections.
 

 
Details

 

-
NMSettingBond

-
typedef struct _NMSettingBond NMSettingBond;

-

-

-

-

-

-
NMSettingBondClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBondClass;
+
NM_SETTING_BOND_SETTING_NAME

+
#define NM_SETTING_BOND_SETTING_NAME "bond"
 

 

 

@@ -138,8 +123,11 @@ necessary for bond connections.
 	NM_SETTING_BOND_ERROR_MISSING_OPTION,   /*< nick=MissingOption >*/
 } NMSettingBondError;
 

-

+

+++
@@ -180,6 +168,24 @@ required
 

+
nm_setting_bond_error_quark ()

+
GQuark              nm_setting_bond_error_quark         (void);

+

+Registers an error quark for NMSettingBond if necessary.
+

+

 


 
 

 
NM_SETTING_BOND_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBond errors.

+

+

+

 
NM_SETTING_BOND_INTERFACE_NAME

 
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
 

@@ -196,16 +202,16 @@ required
 

 

 

-
NM_SETTING_BOND_OPTION_ARP_INTERVAL

-
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
+
NM_SETTING_BOND_OPTION_MODE

+
#define NM_SETTING_BOND_OPTION_MODE          "mode"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

-
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
+
NM_SETTING_BOND_OPTION_MIIMON

+
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
 

 

 

@@ -220,85 +226,67 @@ required
 

 

 

-
NM_SETTING_BOND_OPTION_MIIMON

-
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
+
NM_SETTING_BOND_OPTION_UPDELAY

+
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_MODE

-
#define NM_SETTING_BOND_OPTION_MODE          "mode"
+
NM_SETTING_BOND_OPTION_ARP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_UPDELAY

-
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
+
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
 

 

 

 

 

 

-
NM_SETTING_BOND_SETTING_NAME

-
#define NM_SETTING_BOND_SETTING_NAME "bond"
-

+
NMSettingBond

+
typedef struct _NMSettingBond NMSettingBond;

 

 

 

 

 

-
nm_setting_bond_add_option ()

-
gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);

+
NMSettingBondClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBondClass;
+

 

-Add an option to the table.  The option is compared to an internal list
-of allowed options.  Option names may contain only alphanumeric characters
-(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
-that may already exist.
 

-

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


setting :
the NMSettingBond
-
name :
name for the option
value :
value for the option
Returns :

-TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.

 

 

 

-
nm_setting_bond_error_quark ()

-
GQuark              nm_setting_bond_error_quark         (void);

+
nm_setting_bond_new ()

+
NMSetting *         nm_setting_bond_new                 (void);

 

-Registers an error quark for NMSettingBond if necessary.
+Creates a new NMSettingBond object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBond errors.the new empty NMSettingBond object. [transfer full]
+
 

 

 

@@ -306,8 +294,11 @@ Registers an error quark for 
 
nm_setting_bond_get_interface_name ()

 
const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);

-

+

+++
@@ -330,8 +321,11 @@ Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
 using nm_setting_bond_get_option().
 

-

 


 
 

 
setting :

+

+++
@@ -359,8 +353,11 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
 

-

 


 
 

 
setting :

+

+++
@@ -403,8 +400,11 @@ currently held by the setting)
 Returns the value associated with the bonding option specified by
 name, if it exists.
 

-

 


 
 

 
setting :

+

+++
@@ -417,7 +417,7 @@ Returns the value associated with the bonding option specified by
 
-
@@ -425,11 +425,21 @@ setting; the value is owned by the setting and must not be modified

-
nm_setting_bond_get_option_default ()

-
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
-                                                         const char *name);

-

 


 
 

 
setting :

 

 
Returns :
the value, or NULL if the key/value pair was never added to the
+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_bond_add_option ()

+
gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
+                                                         const char *name,
+                                                         const char *value);

+

+Add an option to the table.  The option is compared to an internal list
+of allowed options.  Option names may contain only alphanumeric characters
+(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
+that may already exist.
+

+

+++
@@ -438,25 +448,35 @@ setting; the value is owned by the setting and must not be modified
-
+
+
+
+
+
-
+

 


 
 

 
setting :

 

 

 
name :
the name of the optionname for the option
value :
value for the option
 

 

 
Returns :
the value of the bond option if not overridden by an entry in
-the "options" property.
+TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
 

 
 

 

 

 

-
nm_setting_bond_get_valid_options ()

-
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

+
nm_setting_bond_remove_option ()

+
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+                                                         const char *name);

 

-Returns a list of valid bond options.
+Remove the bonding option referenced by name from the internal option
+list.
 

-

+

+++
@@ -464,40 +484,54 @@ Returns a list of valid bond options.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
name :
name of the option to remove

 
Returns :
a NULL-terminated array of strings of valid bond options. [transfer none]
-
+TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
 

 
 

 

 

 

-
nm_setting_bond_new ()

-
NMSetting *         nm_setting_bond_new                 (void);

+
nm_setting_bond_get_valid_options ()

+
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

 

-Creates a new NMSettingBond object with default values.
+Returns a list of valid bond options.
 

-

+

+-
++
+
+
+
+
+
+
-
-
+
+

 



setting :
the NMSettingBond
+

 
Returns :
the new empty NMSettingBond object. [transfer full]
+a NULL-terminated array of strings of valid bond options. [transfer none]
 

 

 

 

 

-
nm_setting_bond_remove_option ()

-
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+
nm_setting_bond_get_option_default ()

+
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
                                                          const char *name);

-

-Remove the bonding option referenced by name from the internal option
-list.
-

-

+

+++
@@ -506,13 +540,12 @@ list.
 
-
+
-
+

 


 
 

 
setting :

 

 
name :
name of the option to removethe name of the option
 

 

 
Returns :

-TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.the value of the bond option if not overridden by an entry in
+the "options" property.
 

 
 

@@ -542,6 +575,6 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index e7d071be..b5a9742c 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBridge
-
+
 
 
 
 
-
+
 
 
 
@@ -44,41 +44,41 @@
 
 #include <nm-setting-bridge.h>
 
-                    NMSettingBridge;
-                    NMSettingBridgeClass;
+#define             NM_SETTING_BRIDGE_SETTING_NAME
 enum                NMSettingBridgeError;
-#define             NM_SETTING_BRIDGE_AGEING_TIME
 #define             NM_SETTING_BRIDGE_ERROR
+GQuark              nm_setting_bridge_error_quark       (void);
+#define             NM_SETTING_BRIDGE_INTERFACE_NAME
+#define             NM_SETTING_BRIDGE_STP
+#define             NM_SETTING_BRIDGE_PRIORITY
 #define             NM_SETTING_BRIDGE_FORWARD_DELAY
 #define             NM_SETTING_BRIDGE_HELLO_TIME
-#define             NM_SETTING_BRIDGE_INTERFACE_NAME
 #define             NM_SETTING_BRIDGE_MAX_AGE
-#define             NM_SETTING_BRIDGE_PRIORITY
-#define             NM_SETTING_BRIDGE_SETTING_NAME
-#define             NM_SETTING_BRIDGE_STP
-GQuark              nm_setting_bridge_error_quark       (void);
-guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+#define             NM_SETTING_BRIDGE_AGEING_TIME
+                    NMSettingBridge;
+                    NMSettingBridgeClass;
+NMSetting *         nm_setting_bridge_new               (void);
 const char *        nm_setting_bridge_get_interface_name
                                                         (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
 gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
-NMSetting *         nm_setting_bridge_new               (void);
+guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
+guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBridgeError
+

 
   GObject
    +----NMSetting
          +----NMSettingBridge
 

-
-  GEnum
-   +----NMSettingBridgeError
-

 

 

 
Properties

@@ -102,23 +102,8 @@ necessary for bridging connections.
 

 
Details

 

-
NMSettingBridge

-
typedef struct _NMSettingBridge NMSettingBridge;

-

-

-

-

-

-
NMSettingBridgeClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgeClass;
+
NM_SETTING_BRIDGE_SETTING_NAME

+
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 

 

 

@@ -132,8 +117,11 @@ necessary for bridging connections.
 	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingBridgeError;
 

-

+

+++
@@ -157,40 +145,67 @@ required
 

-
NM_SETTING_BRIDGE_AGEING_TIME

-
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+
NM_SETTING_BRIDGE_ERROR

+
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
 

 

 

 

-
NM_SETTING_BRIDGE_ERROR

-
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+
nm_setting_bridge_error_quark ()

+
GQuark              nm_setting_bridge_error_quark       (void);

+

+Registers an error quark for NMSettingBridge if necessary.
+

+

 


 
 

 
NM_SETTING_BRIDGE_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBridge errors.

+
Since 0.9.8

+

+

+

+
NM_SETTING_BRIDGE_INTERFACE_NAME

+
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_FORWARD_DELAY

-
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+
NM_SETTING_BRIDGE_STP

+
#define NM_SETTING_BRIDGE_STP            "stp"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_HELLO_TIME

-
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+
NM_SETTING_BRIDGE_PRIORITY

+
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_INTERFACE_NAME

-
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+
NM_SETTING_BRIDGE_FORWARD_DELAY

+
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_HELLO_TIME

+
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 

 

 

@@ -205,50 +220,65 @@ required
 

 

 

-
NM_SETTING_BRIDGE_PRIORITY

-
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
+
NM_SETTING_BRIDGE_AGEING_TIME

+
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_SETTING_NAME

-
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
-

+
NMSettingBridge

+
typedef struct _NMSettingBridge NMSettingBridge;

 

 

 

 

 

-
NM_SETTING_BRIDGE_STP

-
#define NM_SETTING_BRIDGE_STP            "stp"
+
NMSettingBridgeClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgeClass;
 

 

 

 

 

 

-
nm_setting_bridge_error_quark ()

-
GQuark              nm_setting_bridge_error_quark       (void);

+
nm_setting_bridge_new ()

+
NMSetting *         nm_setting_bridge_new               (void);

 

-Registers an error quark for NMSettingBridge if necessary.
+Creates a new NMSettingBridge object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBridge errors.the new empty NMSettingBridge object. [transfer full]
+
 

 

 
Since 0.9.8

 

 

 

-
nm_setting_bridge_get_ageing_time ()

-
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_interface_name ()

+
const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);

+

+++
@@ -257,7 +287,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "ageing-time" property of the settingthe "interface-name" property of the setting
 

 
 

@@ -265,10 +295,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_forward_delay ()

-
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_stp ()

+
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

+

+++
@@ -277,7 +310,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "forward-delay" property of the settingthe "stp" property of the setting
 

 
 

@@ -285,10 +318,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_hello_time ()

-
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_priority ()

+
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

+

+++
@@ -297,7 +333,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "hello-time" property of the settingthe "priority" property of the setting
 

 
 

@@ -305,11 +341,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_interface_name ()

-
const char *        nm_setting_bridge_get_interface_name
-                                                        (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_forward_delay ()

+
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

+

+++
@@ -318,7 +356,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "interface-name" property of the settingthe "forward-delay" property of the setting
 

 
 

@@ -326,10 +364,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_max_age ()

-
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_hello_time ()

+
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

+

+++
@@ -338,7 +379,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "max-age" property of the settingthe "hello-time" property of the setting
 

 
 

@@ -346,10 +387,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_priority ()

-
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_max_age ()

+
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

+

+++
@@ -358,7 +402,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "priority" property of the settingthe "max-age" property of the setting
 

 
 

@@ -366,10 +410,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_stp ()

-
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_ageing_time ()

+
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

+

+++
@@ -378,29 +425,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "stp" property of the settingthe "ageing-time" property of the setting
 

 
 

 
Since 0.9.8

 

-

-

-
nm_setting_bridge_new ()

-
NMSetting *         nm_setting_bridge_new               (void);

-

-Creates a new NMSettingBridge object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBridge object. [transfer full]
-

-
Since 0.9.8

-

 

 

 
Property Details

@@ -484,6 +514,6 @@ Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index c4dca496..bb2e37d0 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBridgePort
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-bridge-port.h>
 
-                    NMSettingBridgePort;
-                    NMSettingBridgePortClass;
+#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
 enum                NMSettingBridgePortError;
 #define             NM_SETTING_BRIDGE_PORT_ERROR
-#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-#define             NM_SETTING_BRIDGE_PORT_PATH_COST
-#define             NM_SETTING_BRIDGE_PORT_PRIORITY
-#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
 GQuark              nm_setting_bridge_port_error_quark  (void);
-gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);
+#define             NM_SETTING_BRIDGE_PORT_PRIORITY
+#define             NM_SETTING_BRIDGE_PORT_PATH_COST
+#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+                    NMSettingBridgePort;
+                    NMSettingBridgePortClass;
+NMSetting *         nm_setting_bridge_port_new          (void);
+guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
 guint16             nm_setting_bridge_port_get_path_cost
                                                         (NMSettingBridgePort *setting);
-guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
-NMSetting *         nm_setting_bridge_port_new          (void);
+gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBridgePortError
+

 
   GObject
    +----NMSetting
          +----NMSettingBridgePort
 

-
-  GEnum
-   +----NMSettingBridgePortError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ optional properties that apply to bridge ports.
 

 
Details

 

-
NMSettingBridgePort

-
typedef struct _NMSettingBridgePort NMSettingBridgePort;

-

-

-

-

-

-
NMSettingBridgePortClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgePortClass;
+
NM_SETTING_BRIDGE_PORT_SETTING_NAME

+
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 

 

 

@@ -121,8 +106,11 @@ optional properties that apply to bridge ports.
 	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingBridgePortError;
 

-

+

+++
@@ -154,8 +142,27 @@ is required
 

-
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

-
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+
nm_setting_bridge_port_error_quark ()

+
GQuark              nm_setting_bridge_port_error_quark  (void);

+

+Registers an error quark for NMSettingBridgePort if necessary.
+

+

 


 
 

 
NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBridgePort errors.

+
Since 0.9.8

+

+

+

+
NM_SETTING_BRIDGE_PORT_PRIORITY

+
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 

 

 

@@ -170,43 +177,64 @@ is required
 

 

 

-
NM_SETTING_BRIDGE_PORT_PRIORITY

-
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
+
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

+
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_PORT_SETTING_NAME

-
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+
NMSettingBridgePort

+
typedef struct _NMSettingBridgePort NMSettingBridgePort;

+

+

+

+

+

+
NMSettingBridgePortClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgePortClass;
 

 

 

 

 

 

-
nm_setting_bridge_port_error_quark ()

-
GQuark              nm_setting_bridge_port_error_quark  (void);

+
nm_setting_bridge_port_new ()

+
NMSetting *         nm_setting_bridge_port_new          (void);

 

-Registers an error quark for NMSettingBridgePort if necessary.
+Creates a new NMSettingBridgePort object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBridgePort errors.the new empty NMSettingBridgePort object. [transfer full]
+
 

 

 
Since 0.9.8

 

 

 

-
nm_setting_bridge_port_get_hairpin_mode ()

-
gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);

-

+
nm_setting_bridge_port_get_priority ()

+
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

+

+++
@@ -215,7 +243,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "hairpin-mode" property of the settingthe "priority" property of the setting
 

 
 

@@ -226,8 +254,11 @@ Registers an error quark for 
nm_setting_bridge_port_get_path_cost ()

 
guint16             nm_setting_bridge_port_get_path_cost
                                                         (NMSettingBridgePort *setting);

-

+

+++
@@ -244,10 +275,14 @@ Registers an error quark for 
 

 

-
nm_setting_bridge_port_get_priority ()

-
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

-

 


 
 

 
setting :

+
nm_setting_bridge_port_get_hairpin_mode ()

+
gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);

+

+++
@@ -256,29 +291,12 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "priority" property of the settingthe "hairpin-mode" property of the setting
 

 
 

 
Since 0.9.8

 

-

-

-
nm_setting_bridge_port_new ()

-
NMSetting *         nm_setting_bridge_port_new          (void);

-

-Creates a new NMSettingBridgePort object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBridgePort object. [transfer full]
-

-
Since 0.9.8

-

 

 

 
Property Details

@@ -318,6 +336,6 @@ The Spanning Tree Protocol (STP) priority of this bridge port.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index ffb2f45b..0ce20d15 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -3,12 +3,12 @@
 
 
 NMSettingCdma
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-cdma.h>
 
-                    NMSettingCdma;
-                    NMSettingCdmaClass;
+#define             NM_SETTING_CDMA_SETTING_NAME
 enum                NMSettingCdmaError;
 #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
-#define             NM_SETTING_CDMA_SETTING_NAME
-#define             NM_SETTING_CDMA_USERNAME
-GQuark              nm_setting_cdma_error_quark         (void);
+                    NMSettingCdma;
+                    NMSettingCdmaClass;
+NMSetting *         nm_setting_cdma_new                 (void);
 const 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);
-const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
-NMSetting *         nm_setting_cdma_new                 (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingCdmaError
+

 
   GObject
    +----NMSetting
          +----NMSettingCdma
 

-
-  GEnum
-   +----NMSettingCdmaError
-

 

 

 
Properties

@@ -93,23 +93,8 @@ networks, including those using CDMA2000/EVDO technology.
 

 
Details

 

-
NMSettingCdma

-
typedef struct _NMSettingCdma NMSettingCdma;

-

-

-

-

-

-
NMSettingCdmaClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingCdmaClass;
+
NM_SETTING_CDMA_SETTING_NAME

+
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

 

 

@@ -124,8 +109,11 @@ networks, including those using CDMA2000/EVDO technology.
 	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingCdmaError;
 

-

+

+++
@@ -162,6 +150,24 @@ is missing in the connection
 

+
nm_setting_cdma_error_quark ()

+
GQuark              nm_setting_cdma_error_quark         (void);

+

+Registers an error quark for NMSettingCdma if necessary.
+

+

 


 
 

 
NM_SETTING_CDMA_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingCdma errors.

+

+

+

 
NM_SETTING_CDMA_NUMBER

 
#define NM_SETTING_CDMA_NUMBER         "number"
 

@@ -170,6 +176,14 @@ is missing in the connection
 

 

 

+
NM_SETTING_CDMA_USERNAME

+
#define NM_SETTING_CDMA_USERNAME       "username"
+

+

+

+

+

+

 
NM_SETTING_CDMA_PASSWORD

 
#define NM_SETTING_CDMA_PASSWORD       "password"
 

@@ -186,32 +200,42 @@ is missing in the connection
 

 

 

-
NM_SETTING_CDMA_SETTING_NAME

-
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
-

+
NMSettingCdma

+
typedef struct _NMSettingCdma NMSettingCdma;

 

 

 

 

 

-
NM_SETTING_CDMA_USERNAME

-
#define NM_SETTING_CDMA_USERNAME       "username"
+
NMSettingCdmaClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingCdmaClass;
 

 

 

 

 

 

-
nm_setting_cdma_error_quark ()

-
GQuark              nm_setting_cdma_error_quark         (void);

+
nm_setting_cdma_new ()

+
NMSetting *         nm_setting_cdma_new                 (void);

 

-Registers an error quark for NMSettingCdma if necessary.
+Creates a new NMSettingCdma object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingCdma errors.the new empty NMSettingCdma object
 

 

 

@@ -219,8 +243,11 @@ Registers an error quark for 
 
nm_setting_cdma_get_number ()

 
const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);

-

+

+++
@@ -236,10 +263,13 @@ Registers an error quark for 
-
nm_setting_cdma_get_password ()

-
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

-

 


 
 

 
setting :

+
nm_setting_cdma_get_username ()

+
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

+

+++
@@ -248,17 +278,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "username" property of the setting
 

 
 

 

 

 

-
nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

-

+
nm_setting_cdma_get_password ()

+
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

+

+++
@@ -267,18 +300,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "password" property of the setting
 

 
 

 

 

 

-
nm_setting_cdma_get_username ()

-
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

-

+
nm_setting_cdma_get_password_flags ()

+
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

+

+++
@@ -287,26 +322,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_cdma_new ()

-
NMSetting *         nm_setting_cdma_new                 (void);

-

-Creates a new NMSettingCdma object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingCdma object

-

 

 

 
Property Details

@@ -356,6 +377,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 2fd64bf5..95b82888 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -3,12 +3,12 @@
 
 
 NMSettingConnection
-
+
 
 
 
 
-
+
 
 
 
@@ -44,39 +44,33 @@
 
 #include <nm-setting-connection.h>
 
-                    NMSettingConnection;
-                    NMSettingConnectionClass;
+#define             NM_SETTING_CONNECTION_SETTING_NAME
 enum                NMSettingConnectionError;
-#define             NM_SETTING_CONNECTION_AUTOCONNECT
 #define             NM_SETTING_CONNECTION_ERROR
+GQuark              nm_setting_connection_error_quark   (void);
 #define             NM_SETTING_CONNECTION_ID
-#define             NM_SETTING_CONNECTION_MASTER
-#define             NM_SETTING_CONNECTION_PERMISSIONS
-#define             NM_SETTING_CONNECTION_READ_ONLY
-#define             NM_SETTING_CONNECTION_SECONDARIES
-#define             NM_SETTING_CONNECTION_SETTING_NAME
-#define             NM_SETTING_CONNECTION_SLAVE_TYPE
-#define             NM_SETTING_CONNECTION_TIMESTAMP
-#define             NM_SETTING_CONNECTION_TYPE
 #define             NM_SETTING_CONNECTION_UUID
+#define             NM_SETTING_CONNECTION_TYPE
+#define             NM_SETTING_CONNECTION_AUTOCONNECT
+#define             NM_SETTING_CONNECTION_TIMESTAMP
+#define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_PERMISSIONS
 #define             NM_SETTING_CONNECTION_ZONE
-gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);
-gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);
-GQuark              nm_setting_connection_error_quark   (void);
-gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);
+#define             NM_SETTING_CONNECTION_MASTER
+#define             NM_SETTING_CONNECTION_SLAVE_TYPE
+#define             NM_SETTING_CONNECTION_SECONDARIES
+                    NMSettingConnection;
+                    NMSettingConnectionClass;
+NMSetting *         nm_setting_connection_new           (void);
+const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_connection_type
                                                         (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_permissions
+gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_secondaries
+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,
@@ -84,23 +78,29 @@ const char *        const char **out_ptype,
                                                          const char **out_pitem,
                                                          const char **out_detail);
-gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);
-const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);
-guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);
-gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
-                                                         const char *type);
-NMSetting *         nm_setting_connection_new           (void);
 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);
+const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
+gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                                         const char *type);
+const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);
+gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
 void                nm_setting_connection_remove_secondary
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
@@ -108,15 +108,15 @@ const char *        
 
Object Hierarchy

+
+  GEnum
+   +----NMSettingConnectionError
+

 
   GObject
    +----NMSetting
          +----NMSettingConnection
 

-
-  GEnum
-   +----NMSettingConnectionError
-

 

 

 
Properties

@@ -146,25 +146,8 @@ a 
 
Details

 

-
NMSettingConnection

-
typedef struct _NMSettingConnection NMSettingConnection;

-

-The NMSettingConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMSettingConnectionClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingConnectionClass;
+
NM_SETTING_CONNECTION_SETTING_NAME

+
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

 

 

@@ -184,8 +167,11 @@ It should only be accessed through the functions described below.
 Describes errors that may result from operations involving a
 NMSettingConnection.
 

-

+

+++
@@ -222,19 +208,29 @@ Describes errors that may result from operations involving a
 

-
NM_SETTING_CONNECTION_AUTOCONNECT

-
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+
NM_SETTING_CONNECTION_ERROR

+
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 

 

 

 

-
NM_SETTING_CONNECTION_ERROR

-
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
-

+
nm_setting_connection_error_quark ()

+
GQuark              nm_setting_connection_error_quark   (void);

 

+Registers an error quark for NMSettingConnection if necessary.
 

+

 


 
 

 
NM_SETTING_CONNECTION_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingConnection errors.

 

 

 

@@ -246,16 +242,32 @@ Describes errors that may result from operations involving a
 

 

 

-
NM_SETTING_CONNECTION_MASTER

-
#define NM_SETTING_CONNECTION_MASTER      "master"
+
NM_SETTING_CONNECTION_UUID

+
#define NM_SETTING_CONNECTION_UUID        "uuid"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_PERMISSIONS

-
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+
NM_SETTING_CONNECTION_TYPE

+
#define NM_SETTING_CONNECTION_TYPE        "type"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_AUTOCONNECT

+
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_TIMESTAMP

+
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 

 

 

@@ -270,114 +282,99 @@ Describes errors that may result from operations involving a
 

 

 

-
NM_SETTING_CONNECTION_SECONDARIES

-
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+
NM_SETTING_CONNECTION_PERMISSIONS

+
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_SETTING_NAME

-
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
+
NM_SETTING_CONNECTION_ZONE

+
#define NM_SETTING_CONNECTION_ZONE        "zone"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_SLAVE_TYPE

-
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+
NM_SETTING_CONNECTION_MASTER

+
#define NM_SETTING_CONNECTION_MASTER      "master"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_TIMESTAMP

-
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
+
NM_SETTING_CONNECTION_SLAVE_TYPE

+
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_TYPE

-
#define NM_SETTING_CONNECTION_TYPE        "type"
+
NM_SETTING_CONNECTION_SECONDARIES

+
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_UUID

-
#define NM_SETTING_CONNECTION_UUID        "uuid"
-

+
NMSettingConnection

+
typedef struct _NMSettingConnection NMSettingConnection;

 

+The NMSettingConnection struct contains only private data.
+It should only be accessed through the functions described below.
 

 

 

 

-
NM_SETTING_CONNECTION_ZONE

-
#define NM_SETTING_CONNECTION_ZONE        "zone"
+
NMSettingConnectionClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingConnectionClass;
 

 

 

 

 

 

-
nm_setting_connection_add_permission ()

-
gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);

+
nm_setting_connection_new ()

+
NMSetting *         nm_setting_connection_new           (void);

 

-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.
+Creates a new NMSettingConnection object with default values.
 

-

+

+-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
++
+
-
-
-
+
+

 

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
the new empty NMSettingConnection object

 

 

 

 

-
nm_setting_connection_add_secondary ()

-
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);

+
nm_setting_connection_get_id ()

+
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

 

-Adds a new secondary connetion UUID to the setting.
+Returns the "id" property of the connection.
 

-

+

+++
@@ -385,44 +382,24 @@ Adds a new secondary connetion UUID to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
sec_uuid :
the secondary connection UUID to add

 
Returns :

-TRUE if the secondary connection UUID was added; FALSE if the UUID
-was already presentthe connection ID
 

 
 

-
Since 0.9.8

-

-

-

-
nm_setting_connection_error_quark ()

-
GQuark              nm_setting_connection_error_quark   (void);

-

-Registers an error quark for NMSettingConnection if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingConnection errors.

 

 

 

-
nm_setting_connection_get_autoconnect ()

-
gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_get_uuid ()

+
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

 

-Returns the "autoconnect" property of the connection.
+Returns the "uuid" property of the connection.
 

-

+

+++
@@ -431,7 +408,7 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the connection's autoconnect behaviorthe connection UUID
 

 
 

@@ -444,8 +421,11 @@ Returns the "type" property of the connection.
 

-

+

+++
@@ -461,13 +441,17 @@ Returns the 
-
nm_setting_connection_get_id ()

-
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

+
nm_setting_connection_get_autoconnect ()

+
gboolean            nm_setting_connection_get_autoconnect
+                                                        (NMSettingConnection *setting);

-Returns the "id" property of the connection.
+Returns the "autoconnect" property of the connection.
 

-

 


 
 

 
setting :

 

+

+++
@@ -476,20 +460,23 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the connection IDthe connection's autoconnect behavior
 

 
 

 

 

 

-
nm_setting_connection_get_master ()

-
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

+
nm_setting_connection_get_timestamp ()

+
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

-Returns the "master" property of the connection.
+Returns the "timestamp" property of the connection.
 

-

+

+++
@@ -498,23 +485,23 @@ Returns the Returns :

-
+

 


 
 

 
setting :
interface name of the master device or UUID of the master
-connection.the connection's timestamp
 

 
 

 

 

 

-
nm_setting_connection_get_num_permissions ()

-
guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_get_read_only ()

+
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

 

-Returns the number of entires in the "permissions"
-property of this setting.
+Returns the "read-only" property of the connection.
 

-

+

+++
@@ -523,18 +510,26 @@ property of this setting.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the number of permissions entires
+TRUE if the connection is read-only, FALSE if it is not
 

 
 

 

 

 

-
nm_setting_connection_get_num_secondaries ()

-
guint32             nm_setting_connection_get_num_secondaries
+
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.
+

+

+++
@@ -543,11 +538,10 @@ property of this setting.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the number of configured secondary connection UUIDsthe number of permissions entires
 

 
 

-
Since 0.9.8

 

 

 

@@ -562,8 +556,11 @@ property of this setting.
 Retrieve one of the entries of the "permissions" property
 of this setting.
 

-

+

+++
@@ -585,7 +582,7 @@ of this setting.
 
-
+
@@ -597,13 +594,16 @@ of this setting.
 

-
nm_setting_connection_get_read_only ()

-
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

+
nm_setting_connection_get_zone ()

+
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

 

-Returns the "read-only" property of the connection.
+Returns the "zone" property of the connection.
 

-

 


 
 

 
setting :

 

 
out_detail :
on return, the permission detail (at this time, always NULL)on return, the permission detail (at this time, always NULL)
 

 

 
Returns :

 
 

+

+++
@@ -612,19 +612,25 @@ Returns the Returns :

-
+

 


 
 

 
setting :

-TRUE if the connection is read-only, FALSE if it is notthe trust level of a connection
 

 
 

 

 

 

-
nm_setting_connection_get_secondary ()

-
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);

-

+
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.
+

+

+++
@@ -632,28 +638,36 @@ Returns the idx :

-
+
+
-
+

 


 
 

 
setting :
the zero-based index of the secondary connection UUID entry
uname :
the user name to check permissions for
 

 

 
Returns :
the secondary connection UUID at index idx
-
+TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection
 

 
 

-
Since 0.9.8

 

 

 

-
nm_setting_connection_get_slave_type ()

-
const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_add_permission ()

+
gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);

 

-Returns the "slave-type" property of the connection.
+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.
 

-

+

+++
@@ -661,43 +675,42 @@ Returns the Returns :

-
+
+
-
-

 


 
 

 
setting :
the type of slave this connection is, if any
ptype :
the permission type; at this time only "user" is supported
 

-

-

-

-
nm_setting_connection_get_timestamp ()

-
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

-

-Returns the "timestamp" property of the connection.
-

-

--
-
-
+
+
+
+
+
-
+


 
setting :
the NMSettingConnection
+
pitem :
the permission item formatted as required for ptype
+
detail :
unused at this time; must be NULL. [allow-none]
 
 

 

 
Returns :
the connection's timestampTRUE 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_get_uuid ()

-
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

+
nm_setting_connection_remove_permission ()

+
void                nm_setting_connection_remove_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);

 

-Returns the "uuid" property of the connection.
+Removes the permission at index idx from the connection.
 

-

+

+++
@@ -705,21 +718,24 @@ Returns the Returns :

-
+
+

 


 
 

 
setting :
the connection UUID
idx :
the zero-based index of the permission to remove
 

 
 

 

 

 

-
nm_setting_connection_get_zone ()

-
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

+
nm_setting_connection_get_master ()

+
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

 

-Returns the "zone" property of the connection.
+Returns the "master" property of the connection.
 

-

+

+++
@@ -728,7 +744,8 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the trust level of a connectioninterface name of the master device or UUID of the master
+connection.
 

 
 

@@ -738,8 +755,11 @@ Returns the 
nm_setting_connection_is_slave_type ()

 
gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                                          const char *type);

-

+

+++
@@ -761,30 +781,40 @@ against setting's slave type

-
nm_setting_connection_new ()

-
NMSetting *         nm_setting_connection_new           (void);

+
nm_setting_connection_get_slave_type ()

+
const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);

 

-Creates a new NMSettingConnection object with default values.
+Returns the "slave-type" property of the connection.
 

-

 


 
 

 
setting :

 
 
 

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingConnection
+

 
Returns :
the new empty NMSettingConnection object
the type of slave this connection is, if any

 

 

 

 

-
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.
-

-

+
nm_setting_connection_get_num_secondaries ()

+
guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);

+

+++
@@ -792,29 +822,55 @@ Checks whether the given username is allowed to view/access this connection.
 
-
-
+
+
+
+
+

 


 
 

 
setting :

 

 
uname :
the user name to check permissions for
Returns :
the number of configured secondary connection UUIDs

+
Since 0.9.8

+

+

+

+
nm_setting_connection_get_secondary ()

+
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);

+

++++
+
+
+
+
+
+
+
+
-
+




setting :
the NMSettingConnection
+
idx :
the zero-based index of the secondary connection UUID entry
 

 

 
Returns :

-TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connectionthe secondary connection UUID at index idx
+
 

 
 

+
Since 0.9.8

 

 

 

-
nm_setting_connection_remove_permission ()

-
void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);

+
nm_setting_connection_add_secondary ()

+
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);

 

-Removes the permission at index idx from the connection.
+Adds a new secondary connetion UUID to the setting.
 

-

+

+++
@@ -822,11 +878,18 @@ Removes the permission at index idx from
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
idx :
the zero-based index of the permission to remove
sec_uuid :
the secondary connection UUID to add
Returns :

+TRUE if the secondary connection UUID was added; FALSE if the UUID
+was already present
 

 
 

+
Since 0.9.8

 

 

 

@@ -837,8 +900,11 @@ Removes the permission at index idx from
 

 Removes the secondary coonnection UUID at index idx.
 

-

+

+++
@@ -998,6 +1064,6 @@ default zone as defined by the firewall.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index d10521ac..653911bb 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -3,12 +3,12 @@
 NMSettingGsm
-
+
-
+
@@ -41,60 +41,60 @@
 

 


 
 

 
setting :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
+
 #include <nm-setting-gsm.h>
 
-                    NMSettingGsm;
-                    NMSettingGsmClass;
+#define             NM_SETTING_GSM_SETTING_NAME
 enum                NMSettingGsmError;
-enum                NMSettingGsmNetworkBand;
-enum                NMSettingGsmNetworkType;
-#define             NM_SETTING_GSM_ALLOWED_BANDS
-#define             NM_SETTING_GSM_APN
 #define             NM_SETTING_GSM_ERROR
-#define             NM_SETTING_GSM_HOME_ONLY
-#define             NM_SETTING_GSM_NETWORK_ID
-#define             NM_SETTING_GSM_NETWORK_TYPE
+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_SETTING_NAME
-#define             NM_SETTING_GSM_USERNAME
-GQuark              nm_setting_gsm_error_quark          (void);
-guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
+#define             NM_SETTING_GSM_HOME_ONLY
+enum                NMSettingGsmNetworkType;
+enum                NMSettingGsmNetworkBand;
+                    NMSettingGsm;
+                    NMSettingGsmClass;
+NMSetting *         nm_setting_gsm_new                  (void);
+const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);
-gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);
 int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
+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);
 NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
-NMSetting *         nm_setting_gsm_new                  (void);
+NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
 

 

 

 
Object Hierarchy

 
-  GObject
-   +----NMSetting
-         +----NMSettingGsm
+  GEnum
+   +----NMSettingGsmError
 

 
   GEnum
-   +----NMSettingGsmError
+   +----NMSettingGsmNetworkType
 

 
   GEnum
    +----NMSettingGsmNetworkBand
 

 
-  GEnum
-   +----NMSettingGsmNetworkType
+  GObject
+   +----NMSetting
+         +----NMSettingGsm
 

 

 

@@ -124,23 +124,8 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 

 
Details

 

-
NMSettingGsm

-
typedef struct _NMSettingGsm NMSettingGsm;

-

-

-

-

-

-
NMSettingGsmClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingGsmClass;
+
NM_SETTING_GSM_SETTING_NAME

+
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

 

 

@@ -155,8 +140,11 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingGsmError;
 

-

+

+++
@@ -185,6 +173,187 @@ is missing in the connection
 

+
NM_SETTING_GSM_ERROR

+
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
+

+

+

+

+

+

+
nm_setting_gsm_error_quark ()

+
GQuark              nm_setting_gsm_error_quark          (void);

+

+Registers an error quark for NMSettingGsm if necessary.
+

+

 


 
 

 
NM_SETTING_GSM_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingGsm errors.

+

+

+

+
NM_SETTING_GSM_NUMBER

+
#define NM_SETTING_GSM_NUMBER         "number"
+

+

+

+

+

+

+
NM_SETTING_GSM_USERNAME

+
#define NM_SETTING_GSM_USERNAME       "username"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD

+
#define NM_SETTING_GSM_PASSWORD       "password"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD_FLAGS

+
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_APN

+
#define NM_SETTING_GSM_APN            "apn"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_ID

+
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_TYPE

+
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
+

+

+

+

+

+

+
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_PIN_FLAGS

+
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_HOME_ONLY

+
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
+

+

+

+

+

+

+
enum NMSettingGsmNetworkType

+
typedef enum {
+	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
+	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
+	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
+	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
+} NMSettingGsmNetworkType;
+

+

+NMSettingGsmNetworkType values indicate the allowed access technologies
+the device may use when connecting to this network.
+

+

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




NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
+
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
+preferred but 2G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
+preferred but 3G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G
4G/LTE-type technologies are
+preferred but 3G/2/-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_4G
only 4G/LTE type
+technologies may be used
+

+

+

+

 
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -208,8 +377,11 @@ is missing in the connection
 NMSettingGsmNetworkBand values indicate the allowed frequency bands
 the device may use when connecting to this network.
 

-

+

+++
@@ -291,193 +463,54 @@ the device may use when connecting to this network.
 

-
enum NMSettingGsmNetworkType

-
typedef enum {
-	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
-	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
-	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
-	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
-} NMSettingGsmNetworkType;
-

-

-NMSettingGsmNetworkType values indicate the allowed access technologies
-the device may use when connecting to this network.
-

-

 


 
 

 
NM_SETTING_GSM_BAND_UNKNOWN

 
 

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


NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
-
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
-preferred but 2G-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
-preferred but 3G-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G
4G/LTE-type technologies are
-preferred but 3G/2/-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_4G
only 4G/LTE type
-technologies may be used
-

-

-

-

-
NM_SETTING_GSM_ALLOWED_BANDS

-
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
-

-

-

-

-

-

-
NM_SETTING_GSM_APN

-
#define NM_SETTING_GSM_APN            "apn"
-

-

-

-

-

-

-
NM_SETTING_GSM_ERROR

-
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
-

-

-

-

-

-

-
NM_SETTING_GSM_HOME_ONLY

-
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_ID

-
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_TYPE

-
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
-

-

-

-

-

-

-
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER         "number"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD

-
#define NM_SETTING_GSM_PASSWORD       "password"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD_FLAGS

-
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN

-
#define NM_SETTING_GSM_PIN            "pin"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN_FLAGS

-
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_SETTING_NAME

-
#define NM_SETTING_GSM_SETTING_NAME "gsm"
-

+
NMSettingGsm

+
typedef struct _NMSettingGsm NMSettingGsm;

 

 

 

 

 

-
NM_SETTING_GSM_USERNAME

-
#define NM_SETTING_GSM_USERNAME       "username"
+
NMSettingGsmClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingGsmClass;
 

 

 

 

 

 

-
nm_setting_gsm_error_quark ()

-
GQuark              nm_setting_gsm_error_quark          (void);

+
nm_setting_gsm_new ()

+
NMSetting *         nm_setting_gsm_new                  (void);

 

-Registers an error quark for NMSettingGsm if necessary.
+Creates a new NMSettingGsm object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingGsm errors.the new empty NMSettingGsm object
 

 

 

 

 

-
nm_setting_gsm_get_allowed_bands ()

-
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_number ()

+
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

+

+++
@@ -486,17 +519,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "allowed-bands" property of the settingthe "number" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_apn ()

-
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_username ()

+
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

+

+++
@@ -505,17 +541,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "apn" property of the settingthe "username" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_home_only ()

-
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_password ()

+
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

+

+++
@@ -524,17 +563,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "home-only" property of the settingthe "password" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_id ()

-
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_apn ()

+
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

+

+++
@@ -543,17 +585,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "network-id" property of the settingthe "apn" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_type ()

-
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_network_id ()

+
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

+

+++
@@ -562,17 +607,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "network-type" property of the settingthe "network-id" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_number ()

-
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_network_type ()

+
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

+

+++
@@ -581,17 +629,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "number" property of the settingthe "network-type" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_password ()

-
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_allowed_bands ()

+
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

+

+++
@@ -600,17 +651,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "allowed-bands" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_pin ()

+
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

+

+++
@@ -619,18 +673,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "pin" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_pin ()

-
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_home_only ()

+
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

+

+++
@@ -639,7 +695,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "pin" property of the settingthe "home-only" property of the setting
 

 
 

@@ -648,8 +704,11 @@ Registers an error quark for 
 
nm_setting_gsm_get_pin_flags ()

 
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

-

+

+++
@@ -666,10 +725,13 @@ Registers an error quark for 
-
nm_setting_gsm_get_username ()

-
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

-

 


 
 

 
setting :

+
nm_setting_gsm_get_password_flags ()

+
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

+

+++
@@ -678,26 +740,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_gsm_new ()

-
NMSetting *         nm_setting_gsm_new                  (void);

-

-Creates a new NMSettingGsm object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingGsm object

-

 

 

 
Property Details

@@ -709,7 +757,7 @@ Bitfield of allowed frequency bands.  Note that not all devices allow
 frequency band control.  Permitted values are those specified by
 NMSettingGsmNetworkBand.
 

-
Allowed values: <= 1

+
Allowed values: <= 16383

 
Default value: 1

 

 

@@ -760,7 +808,7 @@ technologies.  Permitted values are those specified by
 NMSettingGsmNetworkType.  Note that not all devices allow network
 preference control.
 

-
Allowed values: [G_MAXULONG,5]

+
Allowed values: [-1,5]

 
Default value: -1

 

 

@@ -832,6 +880,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index df6762af..7e40149b 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -3,12 +3,12 @@
 
 
 NMSettingIP4Config
-
+
 
 
 
 
-
+
 
 
 
@@ -41,127 +41,131 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-ip4-config.h>
 
-typedef             NMIP4Address;
-typedef             NMIP4Route;
-                    NMSettingIP4Config;
-                    NMSettingIP4ConfigClass;
+#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
 enum                NMSettingIP4ConfigError;
-#define             NM_SETTING_IP4_CONFIG_ADDRESSES
-#define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-#define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_ERROR
+GQuark              nm_setting_ip4_config_error_quark   (void);
+#define             NM_SETTING_IP4_CONFIG_METHOD
 #define             NM_SETTING_IP4_CONFIG_DNS
 #define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP4_CONFIG_ERROR
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP4_CONFIG_ADDRESSES
+#define             NM_SETTING_IP4_CONFIG_ROUTES
 #define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
 #define             NM_SETTING_IP4_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP4_CONFIG_METHOD
 #define             NM_SETTING_IP4_CONFIG_METHOD_AUTO
-#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 #define             NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP4_CONFIG_ROUTES
-#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
+#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);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
 guint32             nm_ip4_address_get_address          (NMIP4Address *address);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-NMIP4Address *      nm_ip4_address_new                  (void);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
 void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);
-void                nm_ip4_address_set_gateway          (NMIP4Address *address,
-                                                         guint32 gateway);
+guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
 void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);
-void                nm_ip4_address_unref                (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 *source);
+void                nm_ip4_route_ref                    (NMIP4Route *route);
+void                nm_ip4_route_unref                  (NMIP4Route *route);
 gboolean            nm_ip4_route_compare                (NMIP4Route *route,
                                                          NMIP4Route *other);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
 guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-NMIP4Route *        nm_ip4_route_new                    (void);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
 void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);
-void                nm_ip4_route_set_metric             (NMIP4Route *route,
-                                                         guint32 metric);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);
+guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
 void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
-gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
+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 metric);
+                    NMSettingIP4Config;
+                    NMSettingIP4ConfigClass;
+NMSetting *         nm_setting_ip4_config_new           (void);
+const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
                                                          guint32 dns);
+void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_dns_searches
+                                                        (NMSettingIP4Config *setting);
+const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip4_config_add_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          const char *dns_search);
-gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
-void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);
-void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
 void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);
-void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
-GQuark              nm_setting_ip4_config_error_quark   (void);
+guint32             nm_setting_ip4_config_get_num_addresses
+                                                        (NMSettingIP4Config *setting);
 NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_hostname
+gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);
+void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_clear_addresses
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
+gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);
+void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
 gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_never_default
+gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_addresses
+const char *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns_searches
+gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_routes
+const char *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);
-NMSetting *         nm_setting_ip4_config_new           (void);
-void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);
+gboolean            nm_setting_ip4_config_get_never_default
+                                                        (NMSettingIP4Config *setting);
+gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP4ConfigError
+

 
   GBoxed
    +----NMIP4Address
@@ -175,10 +179,6 @@ const char *        NMSetting
          +----NMSettingIP4Config
 

-
-  GEnum
-   +----NMSettingIP4ConfigError
-

 

 

 
Properties

@@ -207,39 +207,8 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 

 
Details

 

-
NMIP4Address

-
typedef struct NMIP4Address NMIP4Address;
-

-

-

-

-

-

-
NMIP4Route

-
typedef struct NMIP4Route NMIP4Route;
-

-

-

-

-

-

-
NMSettingIP4Config

-
typedef struct _NMSettingIP4Config NMSettingIP4Config;

-

-

-

-

-

-
NMSettingIP4ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP4ConfigClass;
+
NM_SETTING_IP4_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

 

 

@@ -254,8 +223,11 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP4ConfigError;
 

-

+

+++
@@ -284,32 +256,34 @@ not valid with the given IP4 method
 

-
NM_SETTING_IP4_CONFIG_ADDRESSES

-
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

-
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
+
NM_SETTING_IP4_CONFIG_ERROR

+
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
-

+
nm_setting_ip4_config_error_quark ()

+
GQuark              nm_setting_ip4_config_error_quark   (void);

 

+Registers an error quark for NMSettingIP4Config if necessary.
 

+

 


 
 

 
NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingIP4Config errors.

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
+
NM_SETTING_IP4_CONFIG_METHOD

+
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

 

 

@@ -332,16 +306,16 @@ not valid with the given IP4 method
 

 

 

-
NM_SETTING_IP4_CONFIG_ERROR

-
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+
NM_SETTING_IP4_CONFIG_ADDRESSES

+
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+
NM_SETTING_IP4_CONFIG_ROUTES

+
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

 

 

@@ -356,63 +330,86 @@ not valid with the given IP4 method
 

 

 

-
NM_SETTING_IP4_CONFIG_MAY_FAIL

-
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD

-
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
+
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

+
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_AUTO

-
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

 

-IPv4 configuration should be automatically determined via a method appropriate
-for the hardware interface, ie DHCP or PPP or some other device-specific
-manner.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

-
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
+
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

 

-This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
+
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

 

-IPv4 configuration should be automatically configured for link-local-only
-operation.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+
NM_SETTING_IP4_CONFIG_MAY_FAIL

+
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

 

-All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
-in the setting's properties.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_SHARED

+
NM_SETTING_IP4_CONFIG_METHOD_AUTO

+
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+

+

+IPv4 configuration should be automatically determined via a method appropriate
+for the hardware interface, ie DHCP or PPP or some other device-specific
+manner.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
+

+

+IPv4 configuration should be automatically configured for link-local-only
+operation.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+

+

+All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
+in the setting's properties.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 

 

@@ -426,74 +423,131 @@ through that interface to the default network.
 

 

 

-
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
+
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

+
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 

 

+This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_ROUTES

-
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
+
NMIP4Address

+
typedef struct NMIP4Address NMIP4Address;
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
-

+
nm_ip4_address_new ()

+
NMIP4Address *      nm_ip4_address_new                  (void);

 

+Creates and returns a new NMIP4Address object.
 

+

++++
+
+
+
+
+




Returns :
the new empty NMIP4Address object. [transfer full]
+

 

 

 

-
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

+
nm_ip4_address_dup ()

+
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

 

-Determines if two NMIP4Address objects contain the same values.
+Copies a given NMIP4Address object and returns the copy.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
address :
the NMIP4Address
-
other :
the NMIP4Address to compare address to.
source :
the NMIP4Address object to copy
 

 

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.the copy of the given NMIP4Address copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip4_address_dup ()

-
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

+
nm_ip4_address_ref ()

+
void                nm_ip4_address_ref                  (NMIP4Address *address);

 

-Copies a given NMIP4Address object and returns the copy.
+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




address :
the NMIP4Address
+

+

+

+

+
nm_ip4_address_unref ()

+
void                nm_ip4_address_unref                (NMIP4Address *address);

+

+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

-

+

+++
+
+
+
+
+

 


address :
the NMIP4Address
+

+

+

+

+
nm_ip4_address_compare ()

+
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);

+

+Determines if two NMIP4Address objects contain the same values.
+

+

++++
-
-
+
+
+
+
+
+
-
+




 
 
source :
the NMIP4Address object to copy
address :
the NMIP4Address
+
other :
the NMIP4Address to compare address to.
 

 

 
Returns :
the copy of the given NMIP4Address copy. [transfer full]
-
+TRUE if the objects contain the same values, FALSE if they do not.
 

 
 

@@ -505,8 +559,11 @@ Copies a given 
 Gets the IPv4 address property of this address object.
 

-

+

+++
@@ -522,13 +579,17 @@ Gets the IPv4 address property of this address object.
 

-
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

+
nm_ip4_address_set_address ()

+
void                nm_ip4_address_set_address          (NMIP4Address *address,
+                                                         guint32 addr);

 

-Gets the IPv4 default gateway property of this address object.
+Sets the IPv4 address property of this object.
 

-

 


 
 

 
address :

 
 

+

+++
@@ -536,8 +597,8 @@ Gets the IPv4 default gateway property of this address object.
 
-
-
+
+

 


 
 

 
address :

 

 
Returns :
the IPv4 gateway address in network byte order
addr :
the IPv4 address in network byte order
 

 
 

@@ -550,8 +611,11 @@ Gets the IPv4 default gateway property of this address object.
 Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
 object.
 

-

+

+++
@@ -567,46 +631,42 @@ object.
 

-
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

-

-Creates and returns a new NMIP4Address object.
-

-

 


 
 

 
address :

 
 

--
-
-
-
-


Returns :
the new empty NMIP4Address object. [transfer full]
-

-

-

-

-
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

+
nm_ip4_address_set_prefix ()

+
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+                                                         guint32 prefix);

 

-Increases the reference count of the object.
+Sets the IPv4 address prefix.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
address :

 the NMIP4Address
 
prefix :
the address prefix, a number between 1 and 32 inclusive

 

 

 

 

-
nm_ip4_address_set_address ()

-
void                nm_ip4_address_set_address          (NMIP4Address *address,
-                                                         guint32 addr);

+
nm_ip4_address_get_gateway ()

+
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

 

-Sets the IPv4 address property of this object.
+Gets the IPv4 default gateway property of this address object.
 

-

+

+++
@@ -614,8 +674,8 @@ Sets the IPv4 address property of this object.
 
-
-
+
+

 


 
 

 
address :

 

 
addr :
the IPv4 address in network byte order
Returns :
the IPv4 gateway address in network byte order
 

 
 

@@ -628,8 +688,11 @@ Sets the IPv4 address property of this object.
 

 Sets the IPv4 default gateway property of this address object.
 

-

+

+++
@@ -645,40 +708,91 @@ Sets the IPv4 default gateway property of this address object.
 

-
nm_ip4_address_set_prefix ()

-
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
-                                                         guint32 prefix);

+
NMIP4Route

+
typedef struct NMIP4Route NMIP4Route;
+

 

-Sets the IPv4 address prefix.
 

-

 


 
 

 
address :

 
 

+
+

+

+
nm_ip4_route_new ()

+
NMIP4Route *        nm_ip4_route_new                    (void);

+

+Creates and returns a new NMIP4Route object.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMIP4Route object. [transfer full]
+

+

+

+

+
nm_ip4_route_dup ()

+
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);

+

+Copies a given NMIP4Route object and returns the copy.
+

+

+++
-
-
+
+
-
-
+
+

 


 
 
address :
the NMIP4Address
-
source :
the NMIP4Route object to copy
 

 
prefix :
the address prefix, a number between 1 and 32 inclusive
Returns :
the copy of the given NMIP4Route copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

+
nm_ip4_route_ref ()

+
void                nm_ip4_route_ref                    (NMIP4Route *route);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




route :
the NMIP4Route
+

+

+

+

+
nm_ip4_route_unref ()

+
void                nm_ip4_route_unref                  (NMIP4Route *route);

 

 Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.
 

-

+

+++
-
-
+

 


 
address :
the NMIP4Address
+
route :
the NMIP4Route
 
 

 

@@ -691,8 +805,11 @@ reaches zero, the object will be destroyed.
 

 Determines if two NMIP4Route objects contain the same values.
 

-

+

+++
@@ -713,35 +830,42 @@ Determines if two 
 

 

-
nm_ip4_route_dup ()

-
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);

+
nm_ip4_route_get_dest ()

+
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

 

-Copies a given NMIP4Route object and returns the copy.
+Gets the IPv4 destination address property of this route object.
 

-

 


 
 

 
route :

+

+++
-
-
+
+
-
+

 


 
 
source :
the NMIP4Route object to copy
route :
the NMIP4Route
+
 

 

 
Returns :
the copy of the given NMIP4Route copy. [transfer full]
-the IPv4 address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

+
nm_ip4_route_set_dest ()

+
void                nm_ip4_route_set_dest               (NMIP4Route *route,
+                                                         guint32 dest);

 

-Gets the IPv4 destination address property of this route object.
+Sets the IPv4 destination address property of this route object.
 

-

+

+++
@@ -749,22 +873,24 @@ Gets the IPv4 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv4 address in network byte order
dest :
the destination address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

+
nm_ip4_route_get_prefix ()

+
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
 

-

+

+++
@@ -773,20 +899,24 @@ Gets the route metric property of this route object; lower values indicate
 
-
+

 


 
 

 
route :

 

 
Returns :
the route metricthe IPv4 prefix
 

 
 

 

 

 

-
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

+
nm_ip4_route_set_prefix ()

+
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+                                                         guint32 prefix);

 

-Gets the IPv4 address of the next hop of this route.
+Sets the IPv4 prefix of this route.
 

-

+

+++
@@ -794,21 +924,24 @@ Gets the IPv4 address of the next hop of this route.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv4 address in network byte order
prefix :
the prefix, a number between 1 and 32 inclusive
 

 
 

 

 

 

-
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

+
nm_ip4_route_get_next_hop ()

+
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

 

-Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
+Gets the IPv4 address of the next hop of this route.
 

-

+

+++
@@ -817,53 +950,50 @@ Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
 
-
+

 


 
 

 
route :

 

 
Returns :
the IPv4 prefixthe IPv4 address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

-

-Creates and returns a new NMIP4Route object.
-

-

--
-
-
-
-


Returns :
the new empty NMIP4Route object. [transfer full]
-

-

-

-

-
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

+
nm_ip4_route_set_next_hop ()

+
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+                                                         guint32 next_hop);

 

-Increases the reference count of the object.
+Sets the IPv4 address of the next hop of this route.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
route :

 the NMIP4Route
 
next_hop :
the IPv4 address of the next hop in network byte order

 

 

 

 

-
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
-                                                         guint32 dest);

+
nm_ip4_route_get_metric ()

+
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

 

-Sets the IPv4 destination address property of this route object.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

-

+

+++
@@ -871,8 +1001,8 @@ Sets the IPv4 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
dest :
the destination address in network byte order
Returns :
the route metric
 

 
 

@@ -886,8 +1016,11 @@ Sets the IPv4 destination address property of this route object.
 Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
 

-

+

+++
@@ -903,78 +1036,55 @@ Sets the route metric property of this route object; lower values indicate
 

-
nm_ip4_route_set_next_hop ()

-
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);

+
NMSettingIP4Config

+
typedef struct _NMSettingIP4Config NMSettingIP4Config;

 

-Sets the IPv4 address of the next hop of this route.
 

-

 


 
 

 
route :

 
 

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


route :
the NMIP4Route
-
next_hop :
the IPv4 address of the next hop in network byte order

 

 

 

-
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);

+
NMSettingIP4ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP4ConfigClass;
+

 

-Sets the IPv4 prefix of this route.
 

-

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


route :
the NMIP4Route
-
prefix :
the prefix, a number between 1 and 32 inclusive

 

 

 

-
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

+
nm_setting_ip4_config_new ()

+
NMSetting *         nm_setting_ip4_config_new           (void);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Creates a new NMSettingIP4Config object with default values.
 

-

+

+++
-
-
+

 


 
route :
the NMIP4Route
+
Returns :
the new empty NMSettingIP4Config object. [transfer full]
 
 

 

 

 

 

-
nm_setting_ip4_config_add_address ()

-
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

-

-Adds a new IPv4 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip4_config_get_method ()

+
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

+

+++
@@ -982,28 +1092,21 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip4_config_add_dns ()

-
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
-                                                         guint32 dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip4_config_get_num_dns ()

+
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

+

+++
@@ -1011,29 +1114,22 @@ Adds a new DNS server to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
dns :
the IPv4 address (network byte order) of the DNS server to add

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-knownthe number of configured DNS servers
 

 
 

 

 

 

-
nm_setting_ip4_config_add_dns_search ()

-
gboolean            nm_setting_ip4_config_add_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip4_config_get_dns ()

+
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+++
@@ -1041,29 +1137,31 @@ Adds a new DNS search domain to the setting.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add
i :
index number of the DNS server to return
 

 

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already knownthe IPv4 address (network byte order) of the DNS server at index
+i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_add_route ()

-
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

+
nm_setting_ip4_config_add_dns ()

+
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
+                                                         guint32 dns);

 

-Adds a new IPv4 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
+Adds a new DNS server to the setting.
 

-

+

+++
@@ -1071,32 +1169,42 @@ given route is duplicated internally and is not changed by this function.
 
-
-
+
+
+TRUE if the DNS server was added; FALSE if the server was already
+known

 


 
 

 
setting :

 

 
route :
the route to add
dns :
the IPv4 address (network byte order) of the DNS server to add
 

 

 
Returns :

 
-TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip4_config_clear_addresses ()

-
void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns ()

+
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Removes all configured addresses.
+Removes the DNS server at index i.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP4Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1106,8 +1214,11 @@ Removes all configured addresses.
 

 Removes all configured DNS servers.
 

-

+

+++

 


 

 
setting :

 the NMSettingIP4Config
@@ -1117,59 +1228,38 @@ Removes all configured DNS servers.
 
 

 

-
nm_setting_ip4_config_clear_dns_searches ()

-
void                nm_setting_ip4_config_clear_dns_searches
+
nm_setting_ip4_config_get_num_dns_searches ()

+
guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);

-

-Removes all configured DNS search domains.
-

-

+

+-
-
-
-
-

 

setting :
the NMSettingIP4Config
-

-

-

-

-
nm_setting_ip4_config_clear_routes ()

-
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

-

-Removes all configured routes.
-

-

--
++
+
+
-
-





 
setting :

 the NMSettingIP4Config
 

-

-

-

-
nm_setting_ip4_config_error_quark ()

-
GQuark              nm_setting_ip4_config_error_quark   (void);

-

-Registers an error quark for NMSettingIP4Config if necessary.
-

-

--
+
+
-
-
+
+
+



 
Returns :
the error quark used for NMSettingIP4Config errors.
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_dns_search ()

+
const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1178,11 +1268,11 @@ Registers an error quark for 
 
-
+
-
@@ -1190,15 +1280,18 @@ Registers an error quark for 
 

 

-
nm_setting_ip4_config_get_dhcp_client_id ()

-
const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_dns_search ()

+
gboolean            nm_setting_ip4_config_add_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         const char *dns_search);

 

-Returns the value contained in the "dhcp-client-id"
-property.
+Adds a new DNS search domain to the setting.
 

-

 


 
 

 
setting :

 
i :
index number of the address to returnindex number of the DNS search domain to return
 

 

 
Returns :
the address at index i
+the DNS search domain at index i
 
 

 

+

+++
@@ -1206,24 +1299,32 @@ property.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add

 
Returns :
the configured Client ID to send to the DHCP server when requesting
-addresses via DHCP.
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip4_config_get_dhcp_hostname
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns_search ()

+
void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "dhcp-hostname"
-property.
+Removes the DNS search domain at index i.
 

-

+

+++
@@ -1231,46 +1332,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the configured hostname to send to the DHCP server
i :
index number of the DNS search domain
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_send_hostname ()

-
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+
nm_setting_ip4_config_clear_dns_searches ()

+
void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);

 

-Returns the value contained in the "dhcp-send-hostname"
-property.
+Removes all configured DNS search domains.
 

-

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP4Config
 
Returns :

-TRUE if NetworkManager should send the machine hostname to the
-DHCP server when requesting addresses to allow the server to automatically
-update DNS information for this machine.

 

 

 

-

-
nm_setting_ip4_config_get_dns ()

-
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+

+
nm_setting_ip4_config_get_num_addresses ()

+
guint32             nm_setting_ip4_config_get_num_addresses
+                                                        (NMSettingIP4Config *setting);

+

+++
@@ -1278,26 +1375,22 @@ update DNS information for this machine.
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS server to return

 
Returns :
the IPv4 address (network byte order) of the DNS server at index
-i
-the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dns_search ()

-
const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_address ()

+
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1306,11 +1399,11 @@ update DNS information for this machine.
-
+
-
@@ -1318,15 +1411,18 @@ update DNS information for this machine.

-
nm_setting_ip4_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_address ()

+
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);

 

-Returns the value contained in the "ignore-auto-dns"
-property.
+Adds a new IPv4 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
 

-

 


 
 

 
setting :

 

 

 
i :
index number of the DNS search domain to returnindex number of the address to return
 

 

 
Returns :
the DNS search domain at index i
+the address at index i
 
 

 
 
 
 

+

+++
@@ -1334,25 +1430,32 @@ property.
 
+
+
+
+
+TRUE if the address was added; FALSE if the address was already
+known.

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

 
-TRUE if automatically configured (ie via DHCP) DNS information
-should be ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_address ()

+
void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-routes"
-property.
+Removes the address at index i.
 

-

+

+++
@@ -1360,24 +1463,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip4_config_get_may_fail ()

-
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_clear_addresses ()

+
void                nm_setting_ip4_config_clear_addresses
+                                                        (NMSettingIP4Config *setting);

 

-Returns the value contained in the "may-fail"
-property.
+Removes all configured addresses.
 

-

+

++++
+
+
+
+
+




setting :
the NMSettingIP4Config
+

+

+

+

+
nm_setting_ip4_config_get_num_routes ()

+
guint32             nm_setting_ip4_config_get_num_routes
+                                                        (NMSettingIP4Config *setting);

+

+++
@@ -1386,19 +1507,21 @@ property.
 
-
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection doesn't require IPv4 addressing to complete
-for the connection to succeed.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip4_config_get_method ()

-
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_route ()

+
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+++
@@ -1406,23 +1529,31 @@ for the connection to succeed.
+
+
+
+
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the "method" property of the settingthe route at index i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_get_never_default ()

-
gboolean            nm_setting_ip4_config_get_never_default
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_route ()

+
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);

 

-Returns the value contained in the "never-default"
-property.
+Adds a new IPv4 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

-

+

+++
@@ -1430,21 +1561,30 @@ property.
 
+
+
+
+
+TRUE if the route was added; FALSE if the route was already known.

 


 
 

 
setting :

 

 
route :
the route to add

 
Returns :

 
-TRUE if this connection should never be the default connection
-for IPv4 addressing
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_addresses ()

-
guint32             nm_setting_ip4_config_get_num_addresses
-                                                        (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_remove_route ()

+
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+Removes the route at index i.
+

+

+++
@@ -1452,38 +1592,45 @@ for IPv4 addressing
-
-
+
+

 


 
 

 
setting :

 
 

 
Returns :
the number of configured addresses
i :
index number of the route
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_dns ()

-
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_clear_routes ()

+
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

+

+Removes all configured routes.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP4Config
 
Returns :
the number of configured DNS servers

 

 

 

 

-
nm_setting_ip4_config_get_num_dns_searches ()

-
guint32             nm_setting_ip4_config_get_num_dns_searches
+
nm_setting_ip4_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);

-

+

+Returns the value contained in the "ignore-auto-routes"
+property.
+

+

+++
@@ -1492,18 +1639,27 @@ for IPv4 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured DNS search domains
+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_routes ()

-
guint32             nm_setting_ip4_config_get_num_routes
+
nm_setting_ip4_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);

-

+

+Returns the value contained in the "ignore-auto-dns"
+property.
+

+

+++
@@ -1512,18 +1668,27 @@ for IPv4 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured routes
+TRUE if automatically configured (ie via DHCP) DNS information
+should be ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip4_config_get_dhcp_client_id ()

+
const char *        nm_setting_ip4_config_get_dhcp_client_id
+                                                        (NMSettingIP4Config *setting);

+

+Returns the value contained in the "dhcp-client-id"
+property.
+

+

+++
@@ -1531,44 +1696,27 @@ for IPv4 addressing
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the route at index i
-the configured Client ID to send to the DHCP server when requesting
+addresses via DHCP.
 

 
 

 

 

 

-
nm_setting_ip4_config_new ()

-
NMSetting *         nm_setting_ip4_config_new           (void);

-

-Creates a new NMSettingIP4Config object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingIP4Config object. [transfer full]
-

-

-

-

-
nm_setting_ip4_config_remove_address ()

-
void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_dhcp_send_hostname ()

+
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+                                                        (NMSettingIP4Config *setting);

 

-Removes the address at index i.
+Returns the value contained in the "dhcp-send-hostname"
+property.
 

-

+

+++
@@ -1576,22 +1724,29 @@ Removes the address at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the address to remove
Returns :

+TRUE if NetworkManager should send the machine hostname to the
+DHCP server when requesting addresses to allow the server to automatically
+update DNS information for this machine.
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns ()

-
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip4_config_get_dhcp_hostname
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS server at index i.
+Returns the value contained in the "dhcp-hostname"
+property.
 

-

+

+++
@@ -1599,23 +1754,26 @@ Removes the DNS server at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to remove
Returns :
the configured hostname to send to the DHCP server
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns_search ()

-
void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_never_default ()

+
gboolean            nm_setting_ip4_config_get_never_default
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "never-default"
+property.
 

-

+

+++
@@ -1623,22 +1781,27 @@ Removes the DNS search domain at index i
-
-
+
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS search domain
Returns :

+TRUE if this connection should never be the default connection
+for IPv4 addressing
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_route ()

-
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_may_fail ()

+
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

 

-Removes the route at index i.
+Returns the value contained in the "may-fail"
+property.
 

-

+

+++
@@ -1646,8 +1809,10 @@ Removes the route at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the route
Returns :

+TRUE if this connection doesn't require IPv4 addressing to complete
+for the connection to succeed.
 

 
 

@@ -1813,6 +1978,6 @@ or 'disabled' methods because there is no upstream network.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index cca1efa8..9df4ad93 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -3,12 +3,12 @@
 
 
 NMSettingIP6Config
-
+
 
 
 
 
-
+
 
 
 
@@ -41,126 +41,134 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-ip6-config.h>
 
-typedef             NMIP6Address;
-typedef             NMIP6Route;
-                    NMSettingIP6Config;
-                    NMSettingIP6ConfigClass;
+#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
 enum                NMSettingIP6ConfigError;
-enum                NMSettingIP6ConfigPrivacy;
-#define             NM_SETTING_IP6_CONFIG_ADDRESSES
-#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP6_CONFIG_ERROR
+GQuark              nm_setting_ip6_config_error_quark   (void);
+#define             NM_SETTING_IP6_CONFIG_METHOD
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP6_CONFIG_ERROR
-#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP6_CONFIG_ADDRESSES
+#define             NM_SETTING_IP6_CONFIG_ROUTES
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
 #define             NM_SETTING_IP6_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP6_CONFIG_METHOD
+#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 #define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
 #define             NM_SETTING_IP6_CONFIG_METHOD_DHCP
-#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 #define             NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP6_CONFIG_ROUTES
-#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
+enum                NMSettingIP6ConfigPrivacy;
+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);
-NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
 const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-NMIP6Address *      nm_ip6_address_new                  (void);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
 void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);
-void                nm_ip6_address_set_gateway          (NMIP6Address *address,
-                                                         const struct in6_addr *gateway);
+guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
 void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);
-void                nm_ip6_address_unref                (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 *gateway);
+typedef             NMIP6Route;
+NMIP6Route *        nm_ip6_route_new                    (void);
+NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
+void                nm_ip6_route_ref                    (NMIP6Route *route);
+void                nm_ip6_route_unref                  (NMIP6Route *route);
 gboolean            nm_ip6_route_compare                (NMIP6Route *route,
                                                          NMIP6Route *other);
-NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
 const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-NMIP6Route *        nm_ip6_route_new                    (void);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
 void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);
-void                nm_ip6_route_set_metric             (NMIP6Route *route,
-                                                         guint32 metric);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);
+guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
 void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
-gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
+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 metric);
+                    NMSettingIP6Config;
+                    NMSettingIP6ConfigClass;
+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);
 gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
                                                          const struct in6_addr *dns);
+void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);
+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
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip6_config_add_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          const char *dns_search);
-gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
-void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);
-void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
+void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);
 void                nm_setting_ip6_config_clear_dns_searches
                                                         (NMSettingIP6Config *setting);
-void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
-GQuark              nm_setting_ip6_config_error_quark   (void);
-NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);
-const char *        nm_setting_ip6_config_get_dhcp_hostname
+guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);
-const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip6_config_get_dns_search
+gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);
+void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);
-NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
-const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns_searches
+void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);
 NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);
-NMSetting *         nm_setting_ip6_config_new           (void);
-void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
+gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);
 void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);
+void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_ignore_auto_routes
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);
+const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_never_default
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
+NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP6ConfigError
+

+
+  GEnum
+   +----NMSettingIP6ConfigPrivacy
+

 
   GBoxed
    +----NMIP6Address
@@ -174,14 +182,6 @@ const char *        NMSetting
          +----NMSettingIP6Config
 

-
-  GEnum
-   +----NMSettingIP6ConfigError
-

-
-  GEnum
-   +----NMSettingIP6ConfigPrivacy
-

 

 

 
Properties

@@ -209,39 +209,8 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 

 
Details

 

-
NMIP6Address

-
typedef struct NMIP6Address NMIP6Address;
-

-

-

-

-

-

-
NMIP6Route

-
typedef struct NMIP6Route NMIP6Route;
-

-

-

-

-

-

-
NMSettingIP6Config

-
typedef struct _NMSettingIP6Config NMSettingIP6Config;

-

-

-

-

-

-
NMSettingIP6ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP6ConfigClass;
+
NM_SETTING_IP6_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

 

 

@@ -256,8 +225,11 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP6ConfigError;
 

-

+

+++
@@ -286,58 +258,34 @@ not valid with the given IPv6 method
 

-
enum NMSettingIP6ConfigPrivacy

-
typedef enum {
-	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
-} NMSettingIP6ConfigPrivacy;
+
NM_SETTING_IP6_CONFIG_ERROR

+
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 

 

-NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
-Extensions are used (RFC4941).
 

-

 


 
 

 
NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN

 
 

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


NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
-
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
-
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
-are enabled, but public addresses are preferred over temporary addresses
-
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
-are enabled and temporary addresses are preferred over public addresses
-

 

 

 

-
NM_SETTING_IP6_CONFIG_ADDRESSES

-
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
-

+
nm_setting_ip6_config_error_quark ()

+
GQuark              nm_setting_ip6_config_error_quark   (void);

 

+Registers an error quark for NMSettingIP6Config if necessary.
 

+

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingIP6Config errors.

 

 

 

-
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+
NM_SETTING_IP6_CONFIG_METHOD

+
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

 

 

@@ -360,16 +308,16 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_ERROR

-
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
+
NM_SETTING_IP6_CONFIG_ADDRESSES

+
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

 

 

 

 

 

-
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+
NM_SETTING_IP6_CONFIG_ROUTES

+
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 

 

 

@@ -384,8 +332,16 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

-
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

 

 

@@ -400,10 +356,28 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD

-
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
+
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

+
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

+
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 

 

+IPv6 is not required or is handled by some other mechanism, and NetworkManager
+should not configure IPv6 for this connection.
 

 

 

@@ -429,16 +403,6 @@ router advertisements should be ignored.
 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

-
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
-

-

-IPv6 is not required or is handled by some other mechanism, and NetworkManager
-should not configure IPv6 for this connection.
-

-

-

-

 
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -474,27 +438,139 @@ supported for IPv6)
 

 

 

-
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
+
enum NMSettingIP6ConfigPrivacy

+
typedef enum {
+	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
+} NMSettingIP6ConfigPrivacy;
 

 

+NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
+Extensions are used (RFC4941).
 

+

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




NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
+
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
+are enabled, but public addresses are preferred over temporary addresses
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
+are enabled and temporary addresses are preferred over public addresses
+

 

 

 

-
NM_SETTING_IP6_CONFIG_ROUTES

-
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
+
NMIP6Address

+
typedef struct NMIP6Address NMIP6Address;
 

 

 

 

 

 

-
NM_SETTING_IP6_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
-

+
nm_ip6_address_new ()

+
NMIP6Address *      nm_ip6_address_new                  (void);

+

+Creates and returns a new NMIP6Address object.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMIP6Address object. [transfer full]
+

+

+

+

+
nm_ip6_address_dup ()

+
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

+

+Copies a given NMIP6Address object and returns the copy.
+

+

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




source :
the NMIP6Address object to copy
Returns :
the copy of the given NMIP6Address copy. [transfer full]
+

+

+

+

+
nm_ip6_address_ref ()

+
void                nm_ip6_address_ref                  (NMIP6Address *address);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




address :
the NMIP6Address
+

+

+

+

+
nm_ip6_address_unref ()

+
void                nm_ip6_address_unref                (NMIP6Address *address);

 

+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

+

++++
+
+
+
+
+




address :
the NMIP6Address
+

 

 

 

@@ -504,8 +580,11 @@ supported for IPv6)
 

 Determines if two NMIP6Address objects contain the same values.
 

-

+

+++
@@ -526,35 +605,16 @@ Determines if two 
 

 

-
nm_ip6_address_dup ()

-
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

-

-Copies a given NMIP6Address object and returns the copy.
-

-

 


 
 

 
address :

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


source :
the NMIP6Address object to copy
Returns :
the copy of the given NMIP6Address copy. [transfer full]
-

-

-

-

 
nm_ip6_address_get_address ()

 
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

 

 Gets the IPv6 address property of this address object.
 

-

+

+++
@@ -571,13 +631,17 @@ Gets the IPv6 address property of this address object.
 

-
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

+
nm_ip6_address_set_address ()

+
void                nm_ip6_address_set_address          (NMIP6Address *address,
+                                                         const struct in6_addr *addr);

 

-Gets the IPv6 default gateway property of this address object.
+Sets the IPv6 address property of this object.
 

-

 


 
 

 
address :

 
 

+

+++
@@ -585,9 +649,8 @@ Gets the IPv6 default gateway property of this address object.
 
-
-
+
+

 


 
 

 
address :

 

 
Returns :
the IPv6 gateway address. [transfer none]
-
addr :
the IPv6 address
 

 
 

@@ -599,8 +662,11 @@ Gets the IPv6 default gateway property of this address object.
 

 Gets the IPv6 address prefix property of this address object.
 

-

+

+++
@@ -616,46 +682,42 @@ Gets the IPv6 address prefix property of this address object.
 

-
nm_ip6_address_new ()

-
NMIP6Address *      nm_ip6_address_new                  (void);

-

-Creates and returns a new NMIP6Address object.
-

-

 


 
 

 
address :

 
 

--
-
-
-
-


Returns :
the new empty NMIP6Address object. [transfer full]
-

-

-

-

-
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

+
nm_ip6_address_set_prefix ()

+
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+                                                         guint32 prefix);

 

-Increases the reference count of the object.
+Sets the IPv6 address prefix.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
address :

 the NMIP6Address
 
prefix :
the address prefix, a number between 0 and 128 inclusive

 

 

 

 

-
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
-                                                         const struct in6_addr *addr);

+
nm_ip6_address_get_gateway ()

+
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

 

-Sets the IPv6 address property of this object.
+Gets the IPv6 default gateway property of this address object.
 

-

+

+++
@@ -663,8 +725,9 @@ Sets the IPv6 address property of this object.
 
-
-
+
+

 


 
 

 
address :

 

 
addr :
the IPv6 address
Returns :
the IPv6 gateway address. [transfer none]
+
 

 
 

@@ -677,8 +740,11 @@ Sets the IPv6 address property of this object.
 

 Sets the IPv6 default gateway property of this address object.
 

-

+

+++
@@ -694,40 +760,91 @@ Sets the IPv6 default gateway property of this address object.
 

-
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);

+
NMIP6Route

+
typedef struct NMIP6Route NMIP6Route;
+

 

-Sets the IPv6 address prefix.
 

-

 


 
 

 
address :

 
 

+
+

+

+
nm_ip6_route_new ()

+
NMIP6Route *        nm_ip6_route_new                    (void);

+

+Creates and returns a new NMIP6Route object.
+

+

+++
+
+
+
+
+

 


Returns :
the new empty NMIP6Route object. [transfer full]
+

+

+

+

+
nm_ip6_route_dup ()

+
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

+

+Copies a given NMIP6Route object and returns the copy.
+

+

++++
-
-
+
+
-
-
+
+




 
 
address :
the NMIP6Address
-
source :
the NMIP6Route object to copy
 

 
prefix :
the address prefix, a number between 0 and 128 inclusive
Returns :
the copy of the given NMIP6Route copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

+
nm_ip6_route_ref ()

+
void                nm_ip6_route_ref                    (NMIP6Route *route);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




route :
the NMIP6Route
+

+

+

+

+
nm_ip6_route_unref ()

+
void                nm_ip6_route_unref                  (NMIP6Route *route);

 

 Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.
 

-

+

+++
-
-
+

 


 
address :
the NMIP6Address
+
route :
the NMIP6Route
 
 

 

@@ -740,8 +857,11 @@ reaches zero, the object will be destroyed.
 

 Determines if two NMIP6Route objects contain the same values.
 

-

+

+++
@@ -762,35 +882,42 @@ Determines if two 
 

 

-
nm_ip6_route_dup ()

-
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

+
nm_ip6_route_get_dest ()

+
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

 

-Copies a given NMIP6Route object and returns the copy.
+Gets the IPv6 destination address property of this route object.
 

-

 


 
 

 
route :

+

+++
-
-
+
+
-
+

 


 
 
source :
the NMIP6Route object to copy
route :
the NMIP6Route
+
 

 

 
Returns :
the copy of the given NMIP6Route copy. [transfer full]
-the IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

+
nm_ip6_route_set_dest ()

+
void                nm_ip6_route_set_dest               (NMIP6Route *route,
+                                                         const struct in6_addr *dest);

 

-Gets the IPv6 destination address property of this route object.
+Sets the IPv6 destination address property of this route object.
 

-

+

+++
@@ -798,22 +925,24 @@ Gets the IPv6 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv6 address
dest :
the destination address
 

 
 

 

 

 

-
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

+
nm_ip6_route_get_prefix ()

+
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 

-

+

+++
@@ -822,20 +951,24 @@ Gets the route metric property of this route object; lower values indicate
 
-
+

 


 
 

 
route :

 

 
Returns :
the route metricthe IPv6 prefix
 

 
 

 

 

 

-
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

+
nm_ip6_route_set_prefix ()

+
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+                                                         guint32 prefix);

 

-Gets the IPv6 address of the next hop of this route.
+Sets the IPv6 prefix of this route.
 

-

+

+++
@@ -843,21 +976,24 @@ Gets the IPv6 address of the next hop of this route.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv6 address
prefix :
the prefix, a number between 1 and 128 inclusive
 

 
 

 

 

 

-
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

+
nm_ip6_route_get_next_hop ()

+
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

 

-Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
+Gets the IPv6 address of the next hop of this route.
 

-

+

+++
@@ -866,53 +1002,50 @@ Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 
-
+

 


 
 

 
route :

 

 
Returns :
the IPv6 prefixthe IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_new ()

-
NMIP6Route *        nm_ip6_route_new                    (void);

-

-Creates and returns a new NMIP6Route object.
-

-

--
-
-
-
-


Returns :
the new empty NMIP6Route object. [transfer full]
-

-

-

-

-
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

+
nm_ip6_route_set_next_hop ()

+
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+                                                         const struct in6_addr *next_hop);

 

-Increases the reference count of the object.
+Sets the IPv6 address of the next hop of this route.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
route :

 the NMIP6Route
 
next_hop :
the IPv6 address of the next hop

 

 

 

 

-
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
-                                                         const struct in6_addr *dest);

+
nm_ip6_route_get_metric ()

+
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

 

-Sets the IPv6 destination address property of this route object.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

-

+

+++
@@ -920,8 +1053,8 @@ Sets the IPv6 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
dest :
the destination address
Returns :
the route metric
 

 
 

@@ -935,8 +1068,11 @@ Sets the IPv6 destination address property of this route object.
 Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
 

-

+

+++
@@ -952,78 +1088,55 @@ Sets the route metric property of this route object; lower values indicate
 

-
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);

+
NMSettingIP6Config

+
typedef struct _NMSettingIP6Config NMSettingIP6Config;

 

-Sets the IPv6 address of the next hop of this route.
 

-

 


 
 

 
route :

 
 

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


route :
the NMIP6Route
-
next_hop :
the IPv6 address of the next hop

 

 

 

-
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);

+
NMSettingIP6ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP6ConfigClass;
+

 

-Sets the IPv6 prefix of this route.
 

-

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


route :
the NMIP6Route
-
prefix :
the prefix, a number between 1 and 128 inclusive

 

 

 

-
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

+
nm_setting_ip6_config_new ()

+
NMSetting *         nm_setting_ip6_config_new           (void);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Creates a new NMSettingIP6Config object with default values.
 

-

+

+++
-
-
+

 


 
route :
the NMIP6Route
+
Returns :
the new empty NMSettingIP6Config object. [transfer full]
 
 

 

 

 

 

-
nm_setting_ip6_config_add_address ()

-
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

-

-Adds a new IPv6 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip6_config_get_method ()

+
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

+

+++
@@ -1031,28 +1144,21 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip6_config_add_dns ()

-
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
-                                                         const struct in6_addr *dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip6_config_get_num_dns ()

+
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

+

+++
@@ -1060,29 +1166,22 @@ Adds a new DNS server to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
dns :
the IPv6 address of the DNS server to add

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-knownthe number of configured DNS servers
 

 
 

 

 

 

-
nm_setting_ip6_config_add_dns_search ()

-
gboolean            nm_setting_ip6_config_add_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip6_config_get_dns ()

+
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+++
@@ -1090,29 +1189,30 @@ Adds a new DNS search domain to the setting.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add
i :
index number of the DNS server to return
 

 

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already knownthe IPv6 address of the DNS server at index i. [transfer none]
+
 

 
 

 

 

 

-
nm_setting_ip6_config_add_route ()

-
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

+
nm_setting_ip6_config_add_dns ()

+
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
+                                                         const struct in6_addr *dns);

 

-Adds a new IPv6 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
+Adds a new DNS server to the setting.
 

-

+

+++
@@ -1120,32 +1220,42 @@ given route is duplicated internally and is not changed by this function.
 
-
-
+
+
+TRUE if the DNS server was added; FALSE if the server was already
+known

 


 
 

 
setting :

 

 
route :
the route to add
dns :
the IPv6 address of the DNS server to add
 

 

 
Returns :

 
-TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip6_config_clear_addresses ()

-
void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns ()

+
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Removes all configured addresses.
+Removes the DNS server at index i.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1155,8 +1265,11 @@ Removes all configured addresses.
 

 Removes all configured DNS servers.
 

-

+

+++

 


 

 
setting :

 the NMSettingIP6Config
@@ -1166,59 +1279,70 @@ Removes all configured DNS servers.
 
 

 

-
nm_setting_ip6_config_clear_dns_searches ()

-
void                nm_setting_ip6_config_clear_dns_searches
+
nm_setting_ip6_config_get_num_dns_searches ()

+
guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);

-

-Removes all configured DNS search domains.
-

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip6_config_clear_routes ()

-
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

-

-Removes all configured routes.
-

-

+
nm_setting_ip6_config_get_dns_search ()

+
const char *        nm_setting_ip6_config_get_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+-
++
+
+
-
+
+
+
+
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
i :
index number of the DNS search domain to return
Returns :
the DNS search domain at index i
+

 

 

 

 

-
nm_setting_ip6_config_error_quark ()

-
GQuark              nm_setting_ip6_config_error_quark   (void);

+
nm_setting_ip6_config_add_dns_search ()

+
gboolean            nm_setting_ip6_config_add_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         const char *dns_search);

 

-Registers an error quark for NMSettingIP6Config if necessary.
+Adds a new DNS search domain to the setting.
 

-

--
-
-
-
-


Returns :
the error quark used for NMSettingIP6Config errors.

-

-

-

-
nm_setting_ip6_config_get_address ()

-
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+

+++
@@ -1226,28 +1350,32 @@ Registers an error quark for 
 
-
-
+
+
-
+

 


 
 

 
setting :

 
i :
index number of the address to return
dns_search :
the search domain to add
 

 

 
Returns :
the address at index i
-
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip6_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip6_config_get_dhcp_hostname
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns_search ()

+
void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "dhcp-hostname"
-property.
+Removes the DNS search domain at index i.
 

-

+

+++
@@ -1255,20 +1383,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the configured hostname to send to the DHCP server
i :
index number of the DNS search domain
 

 
 

-
Since 0.9.8

 

 

 

-
nm_setting_ip6_config_get_dns ()

-
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_clear_dns_searches ()

+
void                nm_setting_ip6_config_clear_dns_searches
+                                                        (NMSettingIP6Config *setting);

+

+Removes all configured DNS search domains.
+

+

++++
+
+
+
+
+




setting :
the NMSettingIP6Config
+

+

+

+

+
nm_setting_ip6_config_get_num_addresses ()

+
guint32             nm_setting_ip6_config_get_num_addresses
+                                                        (NMSettingIP6Config *setting);

+

+++
@@ -1276,25 +1426,22 @@ property.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to return

 
Returns :
the IPv6 address of the DNS server at index i. [transfer none]
-the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip6_config_get_dns_search ()

-
const char *        nm_setting_ip6_config_get_dns_search
-                                                        (NMSettingIP6Config *setting,
+
nm_setting_ip6_config_get_address ()

+
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1303,11 +1450,11 @@ property.
 
-
+
-
@@ -1315,15 +1462,18 @@ property.
 

-
nm_setting_ip6_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_address ()

+
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);

 

-Returns the value contained in the "ignore-auto-dns"
-property.
+Adds a new IPv6 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
 

-

 


 
 

 
setting :

 

 
i :
index number of the DNS search domain to returnindex number of the address to return
 

 

 
Returns :
the DNS search domain at index i
+the address at index i
 
 

 
 
 

+

+++
@@ -1331,25 +1481,32 @@ property.
 
+
+
+
+
+TRUE if the address was added; FALSE if the address was already
+known.

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

 
-TRUE if automatically configured (ie via DHCP or router
-advertisements) DNS information should be ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_address ()

+
void                nm_setting_ip6_config_remove_address
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-routes"
-property.
+Removes the address at index i.
 

-

+

+++
@@ -1357,48 +1514,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip6_config_get_ip6_privacy ()

-
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+
nm_setting_ip6_config_clear_addresses ()

+
void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);

 

-Returns the value contained in the "ip6-privacy"
-property.
+Removes all configured addresses.
 

-

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

 

 

 

 

-
nm_setting_ip6_config_get_may_fail ()

-
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

-

-Returns the value contained in the "may-fail"
-property.
-

-

+
nm_setting_ip6_config_get_num_routes ()

+
guint32             nm_setting_ip6_config_get_num_routes
+                                                        (NMSettingIP6Config *setting);

+

+++
@@ -1407,19 +1558,21 @@ property.
 
-
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection doesn't require IPv6 addressing to complete
-for the connection to succeed.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip6_config_get_method ()

-
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_get_route ()

+
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+++
@@ -1427,23 +1580,31 @@ for the connection to succeed.
+
+
+
+
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the "method" property of the settingthe route at index i
+
 

 
 

 

 

 

-
nm_setting_ip6_config_get_never_default ()

-
gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_route ()

+
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);

 

-Returns the value contained in the "never-default"
-property.
+Adds a new IPv6 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

-

+

+++
@@ -1451,40 +1612,30 @@ property.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection should never be the default connection
-for IPv6 addressing

-

-

-

-
nm_setting_ip6_config_get_num_addresses ()

-
guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);

-

--
-
-
-
+
+
-
+


setting :
the NMSettingIP6Config
-
route :
the route to add
 

 

 
Returns :
the number of configured addresses
+TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_num_dns ()

-
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_remove_route ()

+
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+Removes the route at index i.
+

+

+++
@@ -1492,39 +1643,45 @@ for IPv6 addressing
-
-
+
+

 


 
 

 
setting :

 
 

 
Returns :
the number of configured DNS servers
i :
index number of the route
 

 
 

 

 

 

-
nm_setting_ip6_config_get_num_dns_searches ()

-
guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_clear_routes ()

+
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

+

+Removes all configured routes.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip6_config_get_num_routes ()

-
guint32             nm_setting_ip6_config_get_num_routes
+
nm_setting_ip6_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);

-

+

+Returns the value contained in the "ignore-auto-routes"
+property.
+

+

+++
@@ -1533,18 +1690,27 @@ for IPv6 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured routes
+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_route ()

-
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);

+

+Returns the value contained in the "ignore-auto-dns"
+property.
+

+

+++
@@ -1552,44 +1718,28 @@ for IPv6 addressing
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the route at index i
-
+TRUE if automatically configured (ie via DHCP or router
+advertisements) DNS information should be ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_new ()

-
NMSetting *         nm_setting_ip6_config_new           (void);

-

-Creates a new NMSettingIP6Config object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingIP6Config object. [transfer full]
-

-

-

-

-
nm_setting_ip6_config_remove_address ()

-
void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);

 

-Removes the address at index i.
+Returns the value contained in the "dhcp-hostname"
+property.
 

-

+

+++
@@ -1597,22 +1747,27 @@ Removes the address at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the address to remove
Returns :
the configured hostname to send to the DHCP server
 

 
 

+
Since 0.9.8

 

 

 

-
nm_setting_ip6_config_remove_dns ()

-
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_never_default ()

+
gboolean            nm_setting_ip6_config_get_never_default
+                                                        (NMSettingIP6Config *setting);

 

-Removes the DNS server at index i.
+Returns the value contained in the "never-default"
+property.
 

-

+

+++
@@ -1620,23 +1775,27 @@ Removes the DNS server at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to remove
Returns :

+TRUE if this connection should never be the default connection
+for IPv6 addressing
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_dns_search ()

-
void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_may_fail ()

+
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "may-fail"
+property.
 

-

+

+++
@@ -1644,22 +1803,28 @@ Removes the DNS search domain at index i
-
-
+
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS search domain
Returns :

+TRUE if this connection doesn't require IPv6 addressing to complete
+for the connection to succeed.
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_route ()

-
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_ip6_privacy ()

+
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);

 

-Removes the route at index i.
+Returns the value contained in the "ip6-privacy"
+property.
 

-

+

+++
@@ -1667,8 +1832,8 @@ Removes the route at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the route
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
 

 
 

@@ -1765,7 +1930,7 @@ in some applications, on the other hand.  The permitted values
 are: 0: disabled, 1: enabled (prefer public address),
 2: enabled (prefer temporary addresses).
 

-
Allowed values: [G_MAXULONG,2]

+
Allowed values: [-1,2]

 
Default value: -1

 

 

@@ -1794,7 +1959,7 @@ 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
+in the 'addresses' property.  If 'ignore' is specified, IPv6
 configuration is not done. This property must be set.  NOTE: the 'shared'
 method are not yet supported.
 

@@ -1829,6 +1994,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 03755208..a5c4b46c 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -3,12 +3,12 @@
 
 
 NMSettingInfiniband
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-infiniband.h>
 
-                    NMSettingInfiniband;
-                    NMSettingInfinibandClass;
+#define             NM_SETTING_INFINIBAND_SETTING_NAME
 enum                NMSettingInfinibandError;
 #define             NM_SETTING_INFINIBAND_ERROR
+GQuark              nm_setting_infiniband_error_quark   (void);
 #define             NM_SETTING_INFINIBAND_MAC_ADDRESS
 #define             NM_SETTING_INFINIBAND_MTU
-#define             NM_SETTING_INFINIBAND_SETTING_NAME
 #define             NM_SETTING_INFINIBAND_TRANSPORT_MODE
-GQuark              nm_setting_infiniband_error_quark   (void);
+                    NMSettingInfiniband;
+                    NMSettingInfinibandClass;
+NMSetting *         nm_setting_infiniband_new           (void);
 const GByteArray *  nm_setting_infiniband_get_mac_address
                                                         (NMSettingInfiniband *setting);
 guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);
 const char *        nm_setting_infiniband_get_transport_mode
                                                         (NMSettingInfiniband *setting);
-NMSetting *         nm_setting_infiniband_new           (void);
 

 
 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingInfinibandError
+

 
   GObject
    +----NMSetting
          +----NMSettingInfiniband
 

-
-  GEnum
-   +----NMSettingInfinibandError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ necessary for connection to IP-over-InfiniBand networks.
 

 
Details

 

-
NMSettingInfiniband

-
typedef struct _NMSettingInfiniband NMSettingInfiniband;

-

-

-

-

-

-
NMSettingInfinibandClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingInfinibandClass;
+
NM_SETTING_INFINIBAND_SETTING_NAME

+
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 

 

 

@@ -121,8 +106,11 @@ necessary for connection to IP-over-InfiniBand networks.
 	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingInfinibandError;
 

-

+

+++
@@ -153,6 +141,24 @@ required
 

+
nm_setting_infiniband_error_quark ()

+
GQuark              nm_setting_infiniband_error_quark   (void);

+

+Registers an error quark for NMSettingInfiniband if necessary.
+

+

 


 
 

 
NM_SETTING_INFINIBAND_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingInfiniband errors.

+

+

+

 
NM_SETTING_INFINIBAND_MAC_ADDRESS

 
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 

@@ -169,32 +175,51 @@ required
 

 

 

-
NM_SETTING_INFINIBAND_SETTING_NAME

-
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
+
NM_SETTING_INFINIBAND_TRANSPORT_MODE

+
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 

 

 

 

 

 

-
NM_SETTING_INFINIBAND_TRANSPORT_MODE

-
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
+
NMSettingInfiniband

+
typedef struct _NMSettingInfiniband NMSettingInfiniband;

+

+

+

+

+

+
NMSettingInfinibandClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingInfinibandClass;
 

 

 

 

 

 

-
nm_setting_infiniband_error_quark ()

-
GQuark              nm_setting_infiniband_error_quark   (void);

+
nm_setting_infiniband_new ()

+
NMSetting *         nm_setting_infiniband_new           (void);

 

-Registers an error quark for NMSettingInfiniband if necessary.
+Creates a new NMSettingInfiniband object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingInfiniband errors.the new empty NMSettingInfiniband object. [transfer full]
+
 

 

 

@@ -203,8 +228,11 @@ Registers an error quark for 
nm_setting_infiniband_get_mac_address ()

 
const GByteArray *  nm_setting_infiniband_get_mac_address
                                                         (NMSettingInfiniband *setting);

-

+

+++
@@ -222,8 +250,11 @@ Registers an error quark for 
 
nm_setting_infiniband_get_mtu ()
guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -246,8 +277,11 @@ Registers an error quark for 
-

 


 
 

 
setting :

+

+++
 
@@ -261,22 +295,6 @@ Returns the transport mode for this device. Either 'datagram' or
 

 


 

 
setting :

 

 

-

-

-
nm_setting_infiniband_new ()

-
NMSetting *         nm_setting_infiniband_new           (void);

-

-Creates a new NMSettingInfiniband object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingInfiniband object. [transfer full]
-

-

 

 

 
Property Details

@@ -313,6 +331,6 @@ The IP-over-InfiniBand transport mode. Either 'datagram' or
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index fe2fa095..4b622152 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -3,12 +3,12 @@
 
 
 NMSettingOlpcMesh
-
+
 
 
 
 
-
+
 
 
 
@@ -41,33 +41,33 @@
 

 

 
Synopsis

-
                    NMSettingOlpcMesh;
-                    NMSettingOlpcMeshClass;
+
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
 enum                NMSettingOlpcMeshError;
-#define             NM_SETTING_OLPC_MESH_CHANNEL
-#define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 #define             NM_SETTING_OLPC_MESH_ERROR
-#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-#define             NM_SETTING_OLPC_MESH_SSID
 GQuark              nm_setting_olpc_mesh_error_quark    (void);
+#define             NM_SETTING_OLPC_MESH_SSID
+#define             NM_SETTING_OLPC_MESH_CHANNEL
+#define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+                    NMSettingOlpcMesh;
+                    NMSettingOlpcMeshClass;
+NMSetting *         nm_setting_olpc_mesh_new            (void);
+const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
 guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);
 const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (NMSettingOlpcMesh *setting);
-const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
-NMSetting *         nm_setting_olpc_mesh_new            (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingOlpcMeshError
+

 
   GObject
    +----NMSetting
          +----NMSettingOlpcMesh
 

-
-  GEnum
-   +----NMSettingOlpcMeshError
-

 

 

 
Properties

@@ -85,23 +85,8 @@ const 
 
Details

 

-
NMSettingOlpcMesh

-
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

-

-

-

-

-

-
NMSettingOlpcMeshClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingOlpcMeshClass;
+
NM_SETTING_OLPC_MESH_SETTING_NAME

+
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

 

 

@@ -115,8 +100,11 @@ const 
+

+++
@@ -139,65 +127,83 @@ required
 

-
NM_SETTING_OLPC_MESH_CHANNEL

-
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
+
NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 

 

 

 

-
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

-
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
-

+
nm_setting_olpc_mesh_error_quark ()

+
GQuark              nm_setting_olpc_mesh_error_quark    (void);

 

 

 

-
NM_SETTING_OLPC_MESH_ERROR

-
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+
NM_SETTING_OLPC_MESH_SSID

+
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

 

 

 

-
NM_SETTING_OLPC_MESH_SETTING_NAME

-
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
+
NM_SETTING_OLPC_MESH_CHANNEL

+
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

 

 

 

-
NM_SETTING_OLPC_MESH_SSID

-
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
+
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

+
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

 

 

 

-
nm_setting_olpc_mesh_error_quark ()

-
GQuark              nm_setting_olpc_mesh_error_quark    (void);

+
NMSettingOlpcMesh

+
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

 

 

 

-
nm_setting_olpc_mesh_get_channel ()

-
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

+
NMSettingOlpcMeshClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingOlpcMeshClass;
+

 

 

 

-
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

-
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
-                                                        (NMSettingOlpcMesh *setting);

+
nm_setting_olpc_mesh_new ()

+
NMSetting *         nm_setting_olpc_mesh_new            (void);

 

+Creates a new NMSettingOlpcMesh object with default values.
 

+

 


 
 

 
NM_SETTING_OLPC_MESH_ERROR_UNKNOWN

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

++++
+
+
+
+
+




Returns :
the new empty NMSettingOlpcMesh object

 

 

 

@@ -208,18 +214,18 @@ required
 

 

 

-
nm_setting_olpc_mesh_new ()

-
NMSetting *         nm_setting_olpc_mesh_new            (void);

+
nm_setting_olpc_mesh_get_channel ()

+
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

+

+

+

+

+

+
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

+
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
+                                                        (NMSettingOlpcMesh *setting);

 

-Creates a new NMSettingOlpcMesh object with default values.
 

-

--
-
-
-
-


Returns :
the new empty NMSettingOlpcMesh object

 

 

 

@@ -254,6 +260,6 @@ SSID of the mesh network to join.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c4d92133..9e13b48b 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -3,12 +3,12 @@
 
 
 NMSettingPPP
-
+
 
 
 
 
-
+
 
 
 
@@ -45,63 +45,63 @@ that require PPP to deliver IP capability

 
 #include <nm-setting-ppp.h>
 
-                    NMSettingPPP;
-                    NMSettingPPPClass;
+#define             NM_SETTING_PPP_SETTING_NAME
 enum                NMSettingPPPError;
-#define             NM_SETTING_PPP_BAUD
-#define             NM_SETTING_PPP_CRTSCTS
 #define             NM_SETTING_PPP_ERROR
-#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
-#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
-#define             NM_SETTING_PPP_MPPE_STATEFUL
-#define             NM_SETTING_PPP_MRU
-#define             NM_SETTING_PPP_MTU
+GQuark              nm_setting_ppp_error_quark          (void);
 #define             NM_SETTING_PPP_NOAUTH
-#define             NM_SETTING_PPP_NOBSDCOMP
-#define             NM_SETTING_PPP_NODEFLATE
-#define             NM_SETTING_PPP_NO_VJ_COMP
-#define             NM_SETTING_PPP_REFUSE_CHAP
 #define             NM_SETTING_PPP_REFUSE_EAP
+#define             NM_SETTING_PPP_REFUSE_PAP
+#define             NM_SETTING_PPP_REFUSE_CHAP
 #define             NM_SETTING_PPP_REFUSE_MSCHAP
 #define             NM_SETTING_PPP_REFUSE_MSCHAPV2
-#define             NM_SETTING_PPP_REFUSE_PAP
+#define             NM_SETTING_PPP_NOBSDCOMP
+#define             NM_SETTING_PPP_NODEFLATE
+#define             NM_SETTING_PPP_NO_VJ_COMP
 #define             NM_SETTING_PPP_REQUIRE_MPPE
 #define             NM_SETTING_PPP_REQUIRE_MPPE_128
-#define             NM_SETTING_PPP_SETTING_NAME
-GQuark              nm_setting_ppp_error_quark          (void);
-guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
+#define             NM_SETTING_PPP_MPPE_STATEFUL
+#define             NM_SETTING_PPP_CRTSCTS
+#define             NM_SETTING_PPP_BAUD
+#define             NM_SETTING_PPP_MRU
+#define             NM_SETTING_PPP_MTU
+#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
+#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
+                    NMSettingPPP;
+                    NMSettingPPPClass;
+NMSetting *         nm_setting_ppp_new                  (void);
 gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
-NMSetting *         nm_setting_ppp_new                  (void);
+gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPP
 

-
-  GEnum
-   +----NMSettingPPPError
-

 

 

 
Properties

@@ -137,23 +137,8 @@ cable and DSL modems and some mobile broadband devices.
 

 
Details

 

-
NMSettingPPP

-
typedef struct _NMSettingPPP NMSettingPPP;

-

-

-

-

-

-
NMSettingPPPClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPClass;
+
NM_SETTING_PPP_SETTING_NAME

+
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

 

 

@@ -168,8 +153,11 @@ cable and DSL modems and some mobile broadband devices.
 	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
 } NMSettingPPPError;
 

-

+

+++
@@ -198,185 +186,225 @@ with other setting configuration parameters
 

-
NM_SETTING_PPP_BAUD

-
#define NM_SETTING_PPP_BAUD              "baud"
+
NM_SETTING_PPP_ERROR

+
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 

 

 

 

-
NM_SETTING_PPP_CRTSCTS

-
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
+
nm_setting_ppp_error_quark ()

+
GQuark              nm_setting_ppp_error_quark          (void);

+

+Registers an error quark for NMSettingPPP if necessary.
+

+

 


 
 

 
NM_SETTING_PPP_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingPPP errors.

+

+

+

+
NM_SETTING_PPP_NOAUTH

+
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

 

 

 

 

 

-
NM_SETTING_PPP_ERROR

-
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+
NM_SETTING_PPP_REFUSE_EAP

+
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_FAILURE

-
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
+
NM_SETTING_PPP_REFUSE_PAP

+
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_INTERVAL

-
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
+
NM_SETTING_PPP_REFUSE_CHAP

+
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MPPE_STATEFUL

-
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
+
NM_SETTING_PPP_REFUSE_MSCHAP

+
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MRU

-
#define NM_SETTING_PPP_MRU               "mru"
+
NM_SETTING_PPP_REFUSE_MSCHAPV2

+
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

 

 

 

 

 

-
NM_SETTING_PPP_MTU

-
#define NM_SETTING_PPP_MTU               "mtu"
+
NM_SETTING_PPP_NOBSDCOMP

+
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

 

 

 

 

 

-
NM_SETTING_PPP_NOAUTH

-
#define NM_SETTING_PPP_NOAUTH            "noauth"
+
NM_SETTING_PPP_NODEFLATE

+
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

 

 

 

 

 

-
NM_SETTING_PPP_NOBSDCOMP

-
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
+
NM_SETTING_PPP_NO_VJ_COMP

+
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

 

 

 

 

 

-
NM_SETTING_PPP_NODEFLATE

-
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
+
NM_SETTING_PPP_REQUIRE_MPPE

+
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

 

 

 

 

 

-
NM_SETTING_PPP_NO_VJ_COMP

-
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
+
NM_SETTING_PPP_REQUIRE_MPPE_128

+
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_CHAP

-
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
+
NM_SETTING_PPP_MPPE_STATEFUL

+
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_EAP

-
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
+
NM_SETTING_PPP_CRTSCTS

+
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAP

-
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
+
NM_SETTING_PPP_BAUD

+
#define NM_SETTING_PPP_BAUD              "baud"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAPV2

-
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
+
NM_SETTING_PPP_MRU

+
#define NM_SETTING_PPP_MRU               "mru"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_PAP

-
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
+
NM_SETTING_PPP_MTU

+
#define NM_SETTING_PPP_MTU               "mtu"
 

 

 

 

 

 

-
NM_SETTING_PPP_REQUIRE_MPPE

-
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
+
NM_SETTING_PPP_LCP_ECHO_FAILURE

+
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

 

 

 

 

 

-
NM_SETTING_PPP_REQUIRE_MPPE_128

-
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
+
NM_SETTING_PPP_LCP_ECHO_INTERVAL

+
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

 

 

 

 

 

-
NM_SETTING_PPP_SETTING_NAME

-
#define NM_SETTING_PPP_SETTING_NAME "ppp"
+
NMSettingPPP

+
typedef struct _NMSettingPPP NMSettingPPP;

+

+

+

+

+

+
NMSettingPPPClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPClass;
 

 

 

 

 

 

-
nm_setting_ppp_error_quark ()

-
GQuark              nm_setting_ppp_error_quark          (void);

+
nm_setting_ppp_new ()

+
NMSetting *         nm_setting_ppp_new                  (void);

 

-Registers an error quark for NMSettingPPP if necessary.
+Creates a new NMSettingPPP object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingPPP errors.the new empty NMSettingPPP object. [transfer full]
+
 

 

 

 

 

-
nm_setting_ppp_get_baud ()

-
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_noauth ()

+
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

+

+++
@@ -385,17 +413,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "baud" property of the settingthe "noauth" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_crtscts ()

-
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_eap ()

+
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

+

+++
@@ -404,17 +435,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "crtscts" property of the settingthe "refuse-eap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_pap ()

+
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

+

+++
@@ -423,18 +457,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "lcp-echo-failure" property of the settingthe "refuse-pap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_chap ()

+
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

+

+++
@@ -443,17 +479,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "lcp-echo-interval" property of the settingthe "refuse-chap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mppe_stateful ()

-
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschap ()

+
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

+

+++
@@ -462,17 +501,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mppe-stateful" property of the settingthe "refuse-mschap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mru ()

-
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschapv2 ()

+
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

+

+++
@@ -481,17 +523,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mru" property of the settingthe "refuse-mschapv2" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mtu ()

-
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nobsdcomp ()

+
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

+

+++
@@ -500,17 +545,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mtu" property of the settingthe "nobsdcomp" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_no_vj_comp ()

-
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nodeflate ()

+
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

+

+++
@@ -519,17 +567,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "no-vj-comp" property of the settingthe "nodeflate" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_noauth ()

-
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_no_vj_comp ()

+
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

+

+++
@@ -538,17 +589,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "noauth" property of the settingthe "no-vj-comp" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_nobsdcomp ()

-
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe ()

+
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

+

+++
@@ -557,17 +611,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "nobsdcomp" property of the settingthe "require-mppe" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_nodeflate ()

-
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe_128 ()

+
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

+

+++
@@ -576,17 +633,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "nodeflate" property of the settingthe "require-mppe-128" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_chap ()

-
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mppe_stateful ()

+
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

+

+++
@@ -595,17 +655,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-chap" property of the settingthe "mppe-stateful" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_eap ()

-
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_crtscts ()

+
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

+

+++
@@ -614,17 +677,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-eap" property of the settingthe "crtscts" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_mschap ()

-
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_baud ()

+
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

+

+++
@@ -633,17 +699,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-mschap" property of the settingthe "baud" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mru ()

+
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

+

+++
@@ -652,17 +721,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-mschapv2" property of the settingthe "mru" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_pap ()

-
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mtu ()

+
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

+

+++
@@ -671,17 +743,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-pap" property of the settingthe "mtu" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_require_mppe ()

-
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_failure ()

+
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

+

+++
@@ -690,17 +765,21 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "require-mppe" property of the settingthe "lcp-echo-failure" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_interval ()

+
guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);

+

+++
@@ -709,27 +788,11 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "require-mppe-128" property of the settingthe "lcp-echo-interval" property of the setting
 

 
 

 

-

-

-
nm_setting_ppp_new ()

-
NMSetting *         nm_setting_ppp_new                  (void);

-

-Creates a new NMSettingPPP object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingPPP object. [transfer full]
-

-

 

 

 
Property Details

@@ -920,6 +983,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 3f20ccec..fd91a0ad 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -3,12 +3,12 @@
 
 
 NMSettingPPPOE
-
+
 
 
 
 
-
+
 
 
 
@@ -44,35 +44,35 @@
 
 #include <nm-setting-pppoe.h>
 
-                    NMSettingPPPOE;
-                    NMSettingPPPOEClass;
+#define             NM_SETTING_PPPOE_SETTING_NAME
 enum                NMSettingPPPOEError;
 #define             NM_SETTING_PPPOE_ERROR
-#define             NM_SETTING_PPPOE_PASSWORD
-#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
+GQuark              nm_setting_pppoe_error_quark        (void);
 #define             NM_SETTING_PPPOE_SERVICE
-#define             NM_SETTING_PPPOE_SETTING_NAME
 #define             NM_SETTING_PPPOE_USERNAME
-GQuark              nm_setting_pppoe_error_quark        (void);
+#define             NM_SETTING_PPPOE_PASSWORD
+#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
+                    NMSettingPPPOE;
+                    NMSettingPPPOEClass;
+NMSetting *         nm_setting_pppoe_new                (void);
+const 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);
-const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
-NMSetting *         nm_setting_pppoe_new                (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPOEError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPPOE
 

-
-  GEnum
-   +----NMSettingPPPOEError
-

 

 

 
Properties

@@ -94,23 +94,8 @@ to provide IP transport, for example cable or DSL modems.
 

 
Details

 

-
NMSettingPPPOE

-
typedef struct _NMSettingPPPOE NMSettingPPPOE;

-

-

-

-

-

-
NMSettingPPPOEClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPOEClass;
+
NM_SETTING_PPPOE_SETTING_NAME

+
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

 

 

@@ -125,8 +110,11 @@ to provide IP transport, for example cable or DSL modems.
 	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingPPPOEError;
 

-

+

+++
@@ -163,65 +151,105 @@ did not contain a required PPP setting for PPP related options
 

-
NM_SETTING_PPPOE_PASSWORD

-
#define NM_SETTING_PPPOE_PASSWORD       "password"
+
nm_setting_pppoe_error_quark ()

+
GQuark              nm_setting_pppoe_error_quark        (void);

+

+Registers an error quark for NMSettingPPPOE if necessary.
+

+

 


 
 

 
NM_SETTING_PPPOE_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingPPPOE errors.

+

+

+

+
NM_SETTING_PPPOE_SERVICE

+
#define NM_SETTING_PPPOE_SERVICE        "service"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_PASSWORD_FLAGS

-
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_PPPOE_USERNAME

+
#define NM_SETTING_PPPOE_USERNAME       "username"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_SERVICE

-
#define NM_SETTING_PPPOE_SERVICE        "service"
+
NM_SETTING_PPPOE_PASSWORD

+
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_SETTING_NAME

-
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
+
NM_SETTING_PPPOE_PASSWORD_FLAGS

+
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_USERNAME

-
#define NM_SETTING_PPPOE_USERNAME       "username"
+
NMSettingPPPOE

+
typedef struct _NMSettingPPPOE NMSettingPPPOE;

+

+

+

+

+

+
NMSettingPPPOEClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPOEClass;
 

 

 

 

 

 

-
nm_setting_pppoe_error_quark ()

-
GQuark              nm_setting_pppoe_error_quark        (void);

+
nm_setting_pppoe_new ()

+
NMSetting *         nm_setting_pppoe_new                (void);

 

-Registers an error quark for NMSettingPPPOE if necessary.
+Creates a new NMSettingPPPOE object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingPPPOE errors.the new empty NMSettingPPPOE object. [transfer full]
+
 

 

 

 

 

-
nm_setting_pppoe_get_password ()

-
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_service ()

+
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

+

+++
@@ -230,18 +258,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "service" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_username ()

+
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

+

+++
@@ -250,18 +280,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "username" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_service ()

-
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_password ()

+
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

+

+++
@@ -270,17 +302,21 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "service" property of the settingthe "password" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_username ()

-
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_password_flags ()

+
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+                                                        (NMSettingPPPOE *setting);

+

+++
@@ -289,27 +325,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_pppoe_new ()

-
NMSetting *         nm_setting_pppoe_new                (void);

-

-Creates a new NMSettingPPPOE object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingPPPOE object. [transfer full]
-

-

 

 

 
Property Details

@@ -356,6 +377,6 @@ Username used to authenticate with the PPPoE service.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index e68a2609..16f6d603 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -3,12 +3,12 @@
 
 
 NMSettingSerial
-
+
 
 
 
 
-
+
 
 
 
@@ -45,36 +45,36 @@ serial communications

 
 #include <nm-setting-serial.h>
 
-                    NMSettingSerial;
-                    NMSettingSerialClass;
+#define             NM_SETTING_SERIAL_SETTING_NAME
 enum                NMSettingSerialError;
+#define             NM_SETTING_SERIAL_ERROR
+GQuark              nm_setting_serial_error_quark       (void);
 #define             NM_SETTING_SERIAL_BAUD
 #define             NM_SETTING_SERIAL_BITS
-#define             NM_SETTING_SERIAL_ERROR
 #define             NM_SETTING_SERIAL_PARITY
-#define             NM_SETTING_SERIAL_SEND_DELAY
-#define             NM_SETTING_SERIAL_SETTING_NAME
 #define             NM_SETTING_SERIAL_STOPBITS
-GQuark              nm_setting_serial_error_quark       (void);
+#define             NM_SETTING_SERIAL_SEND_DELAY
+                    NMSettingSerial;
+                    NMSettingSerialClass;
+NMSetting *         nm_setting_serial_new               (void);
 guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);
 guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);
 char                nm_setting_serial_get_parity        (NMSettingSerial *setting);
-guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);
-NMSetting *         nm_setting_serial_new               (void);
+guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingSerialError
+

 
   GObject
    +----NMSetting
          +----NMSettingSerial
 

-
-  GEnum
-   +----NMSettingSerialError
-

 

 

 
Properties

@@ -97,23 +97,8 @@ such as mobile broadband or analog telephone connections.
 

 
Details

 

-
NMSettingSerial

-
typedef struct _NMSettingSerial NMSettingSerial;

-

-

-

-

-

-
NMSettingSerialClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingSerialClass;
+
NM_SETTING_SERIAL_SETTING_NAME

+
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

 

 

@@ -128,8 +113,11 @@ such as mobile broadband or analog telephone connections.
 	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingSerialError;
 

-

+

+++
@@ -158,6 +146,32 @@ setting requires the connection to contain an 
+
NM_SETTING_SERIAL_ERROR

+
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+

+

+

+
+

+

+
nm_setting_serial_error_quark ()

+
GQuark              nm_setting_serial_error_quark       (void);

+

+Registers an error quark for NMSettingSerial if necessary.
+

+

 


 
 

 
NM_SETTING_SERIAL_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingSerial errors.

+

+

+

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -174,16 +188,16 @@ setting requires the connection to contain an 
-
NM_SETTING_SERIAL_ERROR

-
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+
NM_SETTING_SERIAL_PARITY

+
#define NM_SETTING_SERIAL_PARITY "parity"
 

 

 

 

 

 

-
NM_SETTING_SERIAL_PARITY

-
#define NM_SETTING_SERIAL_PARITY "parity"
+
NM_SETTING_SERIAL_STOPBITS

+
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

 

 

@@ -198,32 +212,43 @@ setting requires the connection to contain an 
-
NM_SETTING_SERIAL_SETTING_NAME

-
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
-

+
NMSettingSerial

+
typedef struct _NMSettingSerial NMSettingSerial;

 

 

 

 

 

-
NM_SETTING_SERIAL_STOPBITS

-
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
+
NMSettingSerialClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingSerialClass;
 

 

 

 

 

 

-
nm_setting_serial_error_quark ()

-
GQuark              nm_setting_serial_error_quark       (void);

+
nm_setting_serial_new ()

+
NMSetting *         nm_setting_serial_new               (void);

 

-Registers an error quark for NMSettingSerial if necessary.
+Creates a new NMSettingSerial object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingSerial errors.the new empty NMSettingSerial object. [transfer full]
+
 

 

 

@@ -231,8 +256,11 @@ Registers an error quark for 
 
nm_setting_serial_get_baud ()

 
guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);

-

+

+++
@@ -250,8 +278,11 @@ Registers an error quark for 
 
nm_setting_serial_get_bits ()
guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -269,8 +300,11 @@ Registers an error quark for 
 
nm_setting_serial_get_parity ()
char                nm_setting_serial_get_parity        (NMSettingSerial *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -286,10 +320,13 @@ Registers an error quark for 
-
nm_setting_serial_get_send_delay ()

-
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

-

 


 
 

 
setting :

+
nm_setting_serial_get_stopbits ()

+
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

+

+++
@@ -298,17 +335,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "send-delay" property of the settingthe "stopbits" property of the setting
 

 
 

 

 

 

-
nm_setting_serial_get_stopbits ()

-
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

-

+
nm_setting_serial_get_send_delay ()

+
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

+

+++
@@ -317,27 +357,11 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "stopbits" property of the settingthe "send-delay" property of the setting
 

 
 

 

-

-

-
nm_setting_serial_new ()

-
NMSetting *         nm_setting_serial_new               (void);

-

-Creates a new NMSettingSerial object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingSerial object. [transfer full]
-

-

 

 

 
Property Details

@@ -396,6 +420,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index d686803b..afbe41bf 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -3,12 +3,12 @@
 
 
 NMSettingVPN
-
+
 
 
 
 
-
+
 
 
 
@@ -44,57 +44,57 @@
 
 #include <nm-setting-vpn.h>
 
+#define             NM_SETTING_VPN_SETTING_NAME
+enum                NMSettingVpnError;
+#define             NM_SETTING_VPN_ERROR
+GQuark              nm_setting_vpn_error_quark          (void);
+#define             NM_SETTING_VPN_SERVICE_TYPE
+#define             NM_SETTING_VPN_USER_NAME
+#define             NM_SETTING_VPN_DATA
+#define             NM_SETTING_VPN_SECRETS
                     NMSettingVPN;
                     NMSettingVPNClass;
-enum                NMSettingVpnError;
 void                (*NMVPNIterFunc)                    (const char *key,
                                                          const char *value,
                                                          gpointer user_data);
-#define             NM_SETTING_VPN_DATA
-#define             NM_SETTING_VPN_ERROR
-#define             NM_SETTING_VPN_SECRETS
-#define             NM_SETTING_VPN_SERVICE_TYPE
-#define             NM_SETTING_VPN_SETTING_NAME
-#define             NM_SETTING_VPN_USER_NAME
+NMSetting *         nm_setting_vpn_new                  (void);
+const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
+const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
+guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
 void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *item);
-void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);
-GQuark              nm_setting_vpn_error_quark          (void);
+const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
+                                                         const char *key);
+void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+                                                         const char *key);
 void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
                                                          NMVPNIterFunc func,
                                                          gpointer user_data);
-void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
-const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
-                                                         const char *key);
-guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
 guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);
+void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *secret);
 const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);
-const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
-const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
-NMSetting *         nm_setting_vpn_new                  (void);
-void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
-                                                         const char *key);
 void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);
+void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingVpnError
+

 
   GObject
    +----NMSetting
          +----NMSettingVPN
 

-
-  GEnum
-   +----NMSettingVpnError
-

 

 

 
Properties

@@ -120,23 +120,8 @@ properties.
 

 
Details

 

-
NMSettingVPN

-
typedef struct _NMSettingVPN NMSettingVPN;

-

-

-

-

-

-
NMSettingVPNClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVPNClass;
+
NM_SETTING_VPN_SETTING_NAME

+
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

 

 

@@ -150,8 +135,11 @@ properties.
 	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingVpnError;
 

-

+

+++
@@ -174,105 +162,109 @@ required
 

-
NMVPNIterFunc ()

-
void                (*NMVPNIterFunc)                    (const char *key,
-                                                         const char *value,
-                                                         gpointer user_data);

-

 


 
 

 
NM_SETTING_VPN_ERROR_UNKNOWN

 
 

+
NM_SETTING_VPN_ERROR

+
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+

+

+

+
+

+

+
nm_setting_vpn_error_quark ()

+
GQuark              nm_setting_vpn_error_quark          (void);

+

+Registers an error quark for NMSettingVPN if necessary.
+

+

+-
-
-
-
-
-
-
-
-
-
-
-
-
-
++
+
+
+
+

 

key :
the name of the data or secret item
value :
the value of the data or secret item
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
-nm_setting_vpn_foreach_secret()
-


Returns :
the error quark used for NMSettingVPN errors.

 

 

 

 

-
NM_SETTING_VPN_DATA

-
#define NM_SETTING_VPN_DATA         "data"
+
NM_SETTING_VPN_SERVICE_TYPE

+
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

 

 

 

 

 

-
NM_SETTING_VPN_ERROR

-
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+
NM_SETTING_VPN_USER_NAME

+
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

 

 

 

 

 

-
NM_SETTING_VPN_SECRETS

-
#define NM_SETTING_VPN_SECRETS      "secrets"
+
NM_SETTING_VPN_DATA

+
#define NM_SETTING_VPN_DATA         "data"
 

 

 

 

 

 

-
NM_SETTING_VPN_SERVICE_TYPE

-
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
+
NM_SETTING_VPN_SECRETS

+
#define NM_SETTING_VPN_SECRETS      "secrets"
 

 

 

 

 

 

-
NM_SETTING_VPN_SETTING_NAME

-
#define NM_SETTING_VPN_SETTING_NAME "vpn"
-

+
NMSettingVPN

+
typedef struct _NMSettingVPN NMSettingVPN;

 

 

 

 

 

-
NM_SETTING_VPN_USER_NAME

-
#define NM_SETTING_VPN_USER_NAME    "user-name"
+
NMSettingVPNClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingVPNClass;
 

 

 

 

 

 

-
nm_setting_vpn_add_data_item ()

-
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *item);

-

-Establishes a relationship between key and item internally in the
-setting which may be retrieved later.  Should not be used to store passwords
-or other secrets, which is what nm_setting_vpn_add_secret() is for.
-

-

+
NMVPNIterFunc ()

+
void                (*NMVPNIterFunc)                    (const char *key,
+                                                         const char *value,
+                                                         gpointer user_data);

+

+++
-
-
+
+
-
-
+
+
-
-
+
@@ -280,16 +272,36 @@ or other secrets, which is what 
-
nm_setting_vpn_add_secret ()

-
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);

+
nm_setting_vpn_new ()

+
NMSetting *         nm_setting_vpn_new                  (void);

-Establishes a relationship between key and secret internally in the
-setting which may be retrieved later.
+Creates a new NMSettingVPN object with default values.
 

-

 


 
 
setting :
the NMSettingVPN
-
key :
the name of the data or secret item
 

 
key :
a name that uniquely identifies the given value item
-
value :
the value of the data or secret item
 

 
item :
the value to be referenced by key
+
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
+nm_setting_vpn_foreach_secret()
 
 

 
 

+

+++
+
+
+
+
+

 


Returns :
the new empty NMSettingVPN object. [transfer full]
+

+

+

+

+
nm_setting_vpn_get_service_type ()

+
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

+

+Returns the service name of the VPN, which identifies the specific VPN
+plugin that should be used to connect to this VPN.
+

+

++++
@@ -297,92 +309,89 @@ setting which may be retrieved later.
 
-
-
-
-
-
-
+
+




 
 

 
setting :

 

 
key :
a name that uniquely identifies the given secret secret
-
secret :
the secret to be referenced by key
-
Returns :
the VPN plugin's service name
 

 
 

 

 

 

-
nm_setting_vpn_error_quark ()

-
GQuark              nm_setting_vpn_error_quark          (void);

-

-Registers an error quark for NMSettingVPN if necessary.
-

-

+
nm_setting_vpn_get_user_name ()

+
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingVPN
+

 
Returns :
the error quark used for NMSettingVPN errors.
the "user-name" property of the setting

 

 

 

 

-
nm_setting_vpn_foreach_data_item ()

-
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_get_num_data_items ()

+
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

 

-Iterates all data items stored in this setting.  It is safe to add, remove,
-and modify data items inside func, though any additions or removals made
-during iteration will not be part of the iteration.
+Gets number of key/value pairs of VPN configuration data.
 

-

+

+++
-
-
-
-
-
-
-
+
+

 


 
 

 
setting :
a NMSettingVPN
-
func :
an user provided function. [scope call]
+the NMSettingVPN
 
 

 
user_data :
data to be passed to func
-
Returns :
the number of VPN plugin specific configuration data items
 

 
 

 

 

 

-
nm_setting_vpn_foreach_secret ()

-
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_add_data_item ()

+
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *item);

 

-Iterates all secrets stored in this setting.  It is safe to add, remove,
-and modify secrets inside func, though any additions or removals made during
-iteration will not be part of the iteration.
+Establishes a relationship between key and item internally in the
+setting which may be retrieved later.  Should not be used to store passwords
+or other secrets, which is what nm_setting_vpn_add_secret() is for.
 

-

+

+++
-
-
-
+
-
-
+
@@ -397,8 +406,11 @@ iteration will not be part of the iteration.
 Retrieves the data item of a key/value relationship previously established
 by nm_setting_vpn_add_data_item().
 

-

 


 
 

 
setting :
a NMSettingVPN
+the NMSettingVPN
 
 

 
func :
an user provided function. [scope call]
+
key :
a name that uniquely identifies the given value item
 
 

 
user_data :
data to be passed to func
+
item :
the value to be referenced by key
 
 

 

+

+++
@@ -418,13 +430,18 @@ by 
-
nm_setting_vpn_get_num_data_items ()

-
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

+
nm_setting_vpn_remove_data_item ()

+
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+                                                         const char *key);

-Gets number of key/value pairs of VPN configuration data.
+Deletes a key/value relationship previously established by
+nm_setting_vpn_add_data_item().
 

-

 


 
 

 
setting :

 

+

+++
@@ -432,45 +449,59 @@ Gets number of key/value pairs of VPN configuration data.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the number of VPN plugin specific configuration data items
key :
the name of the data item to remove
 

 
 

 

 

 

-
nm_setting_vpn_get_num_secrets ()

-
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

+
nm_setting_vpn_foreach_data_item ()

+
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Gets number of VPN plugin specific secrets in the setting.
+Iterates all data items stored in this setting.  It is safe to add, remove,
+and modify data items inside func, though any additions or removals made
+during iteration will not be part of the iteration.
 

-

+

+++
-
-
-
+
+
+
+
+
+

 


 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
Returns :
the number of VPN plugin specific secrets
func :
an user provided function. [scope call]
+
user_data :
data to be passed to func
+
 

 
 

 

 

 

-
nm_setting_vpn_get_secret ()

-
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
-                                                         const char *key);

+
nm_setting_vpn_get_num_secrets ()

+
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

 

-Retrieves the secret of a key/value relationship previously established
-by nm_setting_vpn_add_secret().
+Gets number of VPN plugin specific secrets in the setting.
 

-

+

+++
@@ -478,26 +509,27 @@ by key :

-
-
-
-
+

 


 
 

 
setting :
the name of the secret to retrieve

 
Returns :
the secret, if anythe number of VPN plugin specific secrets
 

 
 

 

 

 

-
nm_setting_vpn_get_service_type ()

-
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

+
nm_setting_vpn_add_secret ()

+
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *secret);

 

-Returns the service name of the VPN, which identifies the specific VPN
-plugin that should be used to connect to this VPN.
+Establishes a relationship between key and secret internally in the
+setting which may be retrieved later.
 

-

+

+++
@@ -505,18 +537,32 @@ plugin that should be used to connect to this VPN.
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
Returns :
the VPN plugin's service name
key :
a name that uniquely identifies the given secret secret
+
secret :
the secret to be referenced by key
+
 

 
 

 

 

 

-
nm_setting_vpn_get_user_name ()

-
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

-

+
nm_setting_vpn_get_secret ()

+
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
+                                                         const char *key);

+

+Retrieves the secret of a key/value relationship previously established
+by nm_setting_vpn_add_secret().
+

+

+++
@@ -524,39 +570,30 @@ plugin that should be used to connect to this VPN.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
key :
the name of the secret to retrieve

 
Returns :
the "user-name" property of the settingthe secret, if any
 

 
 

 

 

 

-
nm_setting_vpn_new ()

-
NMSetting *         nm_setting_vpn_new                  (void);

-

-Creates a new NMSettingVPN object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingVPN object. [transfer full]
-

-

-

-

-
nm_setting_vpn_remove_data_item ()

-
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+
nm_setting_vpn_remove_secret ()

+
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);

 

 Deletes a key/value relationship previously established by
-nm_setting_vpn_add_data_item().
+nm_setting_vpn_add_secret().
 

-

+

+++
@@ -565,31 +602,42 @@ Deletes a key/value relationship previously established by
 
-
+

 


 
 

 
setting :

 

 
key :
the name of the data item to removethe name of the secret to remove
 

 
 

 

 

 

-
nm_setting_vpn_remove_secret ()

-
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
-                                                         const char *key);

+
nm_setting_vpn_foreach_secret ()

+
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Deletes a key/value relationship previously established by
-nm_setting_vpn_add_secret().
+Iterates all secrets stored in this setting.  It is safe to add, remove,
+and modify secrets inside func, though any additions or removals made during
+iteration will not be part of the iteration.
 

-

+

+++
-
-
-
+
+
+
+
+
+

 


 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
key :
the name of the secret to remove
func :
an user provided function. [scope call]
+
user_data :
data to be passed to func
+
 

 
 

@@ -643,6 +691,6 @@ VPN connection.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index b1edb3ad..edc209ba 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -3,12 +3,12 @@
 
 
 NMSettingVlan
-
+
 
 
 
 
-
+
 
 
 
@@ -41,51 +41,55 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-vlan.h>
 
-                    NMSettingVlan;
-                    NMSettingVlanClass;
+#define             NM_SETTING_VLAN_SETTING_NAME
 enum                NMSettingVlanError;
-enum                NMVlanFlags;
-enum                NMVlanPriorityMap;
-#define             NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
 #define             NM_SETTING_VLAN_ERROR
-#define             NM_SETTING_VLAN_FLAGS
-#define             NM_SETTING_VLAN_ID
-#define             NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+GQuark              nm_setting_vlan_error_quark         (void);
 #define             NM_SETTING_VLAN_INTERFACE_NAME
 #define             NM_SETTING_VLAN_PARENT
-#define             NM_SETTING_VLAN_SETTING_NAME
-gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);
-gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);
-void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);
-GQuark              nm_setting_vlan_error_quark         (void);
-guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);
-guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);
+#define             NM_SETTING_VLAN_ID
+#define             NM_SETTING_VLAN_FLAGS
+#define             NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+#define             NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+                    NMSettingVlan;
+                    NMSettingVlanClass;
+enum                NMVlanPriorityMap;
+enum                NMVlanFlags;
+NMSetting *         nm_setting_vlan_new                 (void);
 const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);
+const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);
+guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);
+guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);
 gint32              nm_setting_vlan_get_num_priorities  (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map);
-const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);
 gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
                                                          guint32 idx,
                                                          guint32 *out_from,
                                                          guint32 *out_to);
-NMSetting *         nm_setting_vlan_new                 (void);
+gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 from,
+                                                         guint32 to);
 void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
                                                          guint32 idx);
+void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map);
+gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         const char *str);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingVlanError
+

 
   GObject
    +----NMSetting
@@ -93,16 +97,12 @@ const char *        
   GEnum
-   +----NMSettingVlanError
+   +----NMVlanPriorityMap
 

 
   GEnum
    +----NMVlanFlags
 

-
-  GEnum
-   +----NMVlanPriorityMap
-

 

 

 
Properties

@@ -125,23 +125,8 @@ necessary for connection to VLAN interfaces.
 

 
Details

 

-
NMSettingVlan

-
typedef struct _NMSettingVlan NMSettingVlan;

-

-

-

-

-

-
NMSettingVlanClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVlanClass;
+
NM_SETTING_VLAN_SETTING_NAME

+
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 

 

 

@@ -156,8 +141,11 @@ necessary for connection to VLAN interfaces.
 	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
 } NMSettingVlanError;
 

-

+

+++
@@ -186,99 +174,58 @@ necessary for connection to VLAN interfaces.
 

-
enum NMVlanFlags

-
typedef enum {
-	NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
-	NM_VLAN_FLAG_GVRP            = 0x2,
-	NM_VLAN_FLAG_LOOSE_BINDING   = 0x4,
-
-	/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
-} NMVlanFlags;
+
NM_SETTING_VLAN_ERROR

+
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
 

 

-NMVlanFlags values control the behavior of the VLAN interface.
 

-

 


 
 

 
NM_SETTING_VLAN_ERROR_UNKNOWN

 
 

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


NM_VLAN_FLAG_REORDER_HEADERS
indicates that this interface should reorder
- outgoing packet headers to look more like a non-VLAN ethernet interface
-
NM_VLAN_FLAG_GVRP
indicates that this interface should use GVRP to register
- itself with it's switch
-
NM_VLAN_FLAG_LOOSE_BINDING
indicates that this interface's operating
- state is tied to the underlying network interface but other details
- (like routing) are not.
-

 

 

 

-
enum NMVlanPriorityMap

-
typedef enum {
-	NM_VLAN_INGRESS_MAP,
-	NM_VLAN_EGRESS_MAP
-} NMVlanPriorityMap;
-

+
nm_setting_vlan_error_quark ()

+
GQuark              nm_setting_vlan_error_quark         (void);

 

-A selector for traffic priority maps; these map Linux SKB priorities
-to 802.1p priorities used in VLANs.
+Registers an error quark for NMSettingVlan if necessary.
 

-

+

+-
-
-
-
-
-
-
-
-
-
++
+
+
+
+

 

NM_VLAN_INGRESS_MAP
map for incoming data
-
NM_VLAN_EGRESS_MAP
map for outgoing data
-


Returns :
the error quark used for NMSettingVlan errors.

 

 

 

 

-
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

-
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
+
NM_SETTING_VLAN_INTERFACE_NAME

+
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
 

 

 

 

 

 

-
NM_SETTING_VLAN_ERROR

-
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
+
NM_SETTING_VLAN_PARENT

+
#define NM_SETTING_VLAN_PARENT               "parent"
 

 

 

 

 

 

-
NM_SETTING_VLAN_FLAGS

-
#define NM_SETTING_VLAN_FLAGS                "flags"
+
NM_SETTING_VLAN_ID

+
#define NM_SETTING_VLAN_ID                   "id"
 

 

 

 

 

 

-
NM_SETTING_VLAN_ID

-
#define NM_SETTING_VLAN_ID                   "id"
+
NM_SETTING_VLAN_FLAGS

+
#define NM_SETTING_VLAN_FLAGS                "flags"
 

 

 

@@ -293,124 +240,136 @@ to 802.1p priorities used in VLANs.
 

 

 

-
NM_SETTING_VLAN_INTERFACE_NAME

-
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
+
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 

 

 

 

 

 

-
NM_SETTING_VLAN_PARENT

-
#define NM_SETTING_VLAN_PARENT               "parent"
-

+
NMSettingVlan

+
typedef struct _NMSettingVlan NMSettingVlan;

 

 

 

 

 

-
NM_SETTING_VLAN_SETTING_NAME

-
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
+
NMSettingVlanClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingVlanClass;
 

 

 

 

 

 

-
nm_setting_vlan_add_priority ()

-
gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);

-

-Adds a priority mapping to the "ingress_priority_map" or
-"egress_priority_map" properties of the setting. If from is
-already in the given priority map, this function will overwrite the
-existing entry with the new to.
-

-

-If map is NM_VLAN_INGRESS_MAP then from is the incoming 802.1q VLAN
-Priority Code Point (PCP) value, and to is the Linux SKB priority value.
-

+
enum NMVlanPriorityMap

+
typedef enum {
+	NM_VLAN_INGRESS_MAP,
+	NM_VLAN_EGRESS_MAP
+} NMVlanPriorityMap;
+

 

-If map is NM_VLAN_EGRESS_MAP then from is the Linux SKB priority value and
-to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
+A selector for traffic priority maps; these map Linux SKB priorities
+to 802.1p priorities used in VLANs.
 

-

+

+++
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-

 


 
 
setting :
the NMSettingVlan
+
NM_VLAN_INGRESS_MAP
map for incoming data
 
 

 
map :
the type of priority map
from :
the priority to map to to
+
NM_VLAN_EGRESS_MAP
map for outgoing data
 
 
to :
the priority to map from to
Returns :
TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

 
 

 

 

 

-
nm_setting_vlan_add_priority_str ()

-
gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);

+
enum NMVlanFlags

+
typedef enum {
+	NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
+	NM_VLAN_FLAG_GVRP            = 0x2,
+	NM_VLAN_FLAG_LOOSE_BINDING   = 0x4,
+
+	/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
+} NMVlanFlags;
+

 

-Adds a priority map entry into either the "ingress_priority_map"
-or the "egress_priority_map" properties.  The priority map maps
-the Linux SKB priorities to 802.1p priorities.
+NMVlanFlags values control the behavior of the VLAN interface.
 

-

+

+++
-
-
+
-
-
-
-
-
-
+
+
-
-
+
+

 


 
 
setting :
the NMSettingVlan
+
NM_VLAN_FLAG_REORDER_HEADERS
indicates that this interface should reorder
+ outgoing packet headers to look more like a non-VLAN ethernet interface
 
 

 
map :
the type of priority map
str :
the string which contains a priority map, like "3:7"
NM_VLAN_FLAG_GVRP
indicates that this interface should use GVRP to register
+ itself with it's switch
+
 

 
Returns :
TRUE if the entry was successfully added to the list, or it
-overwrote the old value, FALSE if error
NM_VLAN_FLAG_LOOSE_BINDING
indicates that this interface's operating
+ state is tied to the underlying network interface but other details
+ (like routing) are not.
+
 

 
 

 

 

 

-
nm_setting_vlan_clear_priorities ()

-
void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);

+
nm_setting_vlan_new ()

+
NMSetting *         nm_setting_vlan_new                 (void);

 

-Clear all the entires from "ingress_priority_map" or
-"egress_priority_map" properties.
+Creates a new NMSettingVlan object with default values.
 

-

+

++++
+
+
+
+
+




Returns :
the new empty NMSettingVlan object. [transfer full]
+

+

+

+

+
nm_setting_vlan_get_interface_name ()

+
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

+

+++
@@ -418,33 +377,21 @@ Clear all the entires from map :

-
+
+

 


 
 

 
setting :
the type of priority map
Returns :
the "interface_name" property of the setting
 

 
 

 

 

 

-
nm_setting_vlan_error_quark ()

-
GQuark              nm_setting_vlan_error_quark         (void);

-

-Registers an error quark for NMSettingVlan if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingVlan errors.

-

-

-

-
nm_setting_vlan_get_flags ()

-
guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);

-

+
nm_setting_vlan_get_parent ()

+
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);

+

+++
@@ -453,7 +400,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "flags" property of the settingthe "parent" property of the setting
 

 
 

@@ -462,8 +409,11 @@ Registers an error quark for 
 
nm_setting_vlan_get_id ()

 
guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);

-

+

+++
@@ -479,10 +429,13 @@ Registers an error quark for 
-
nm_setting_vlan_get_interface_name ()

-
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

-

 


 
 

 
setting :

+
nm_setting_vlan_get_flags ()

+
guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);

+

+++
@@ -491,7 +444,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "interface_name" property of the settingthe "flags" property of the setting
 

 
 

@@ -506,8 +459,11 @@ Returns the number of entires in the
 "ingress_priority_map" or "egress_priority_map"
 properties of this setting.
 

-

+

+++
@@ -527,25 +483,6 @@ properties of this setting.
 

-
nm_setting_vlan_get_parent ()

-
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);

-

 


 
 

 
setting :

 
 

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


setting :
the NMSettingVlan
-
Returns :
the "parent" property of the setting

-

-

-

 
nm_setting_vlan_get_priority ()

 
gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
@@ -556,8 +493,11 @@ properties of this setting.
 Retrieve one of the entries of the "ingress_priority_map"
 or "egress_priority_map" properties of this setting.
 

-

+

+++
@@ -592,18 +532,55 @@ or 
 

 

-
nm_setting_vlan_new ()

-
NMSetting *         nm_setting_vlan_new                 (void);

+
nm_setting_vlan_add_priority ()

+
gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 from,
+                                                         guint32 to);

 

-Creates a new NMSettingVlan object with default values.
+Adds a priority mapping to the "ingress_priority_map" or
+"egress_priority_map" properties of the setting. If from is
+already in the given priority map, this function will overwrite the
+existing entry with the new to.
 

-

 


 
 

 
setting :

+

+If map is NM_VLAN_INGRESS_MAP then from is the incoming 802.1q VLAN
+Priority Code Point (PCP) value, and to is the Linux SKB priority value.
+

+

+If map is NM_VLAN_EGRESS_MAP then from is the Linux SKB priority value and
+to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
+

+

+-
-
-+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 

Returns :
the new empty NMSettingVlan object. [transfer full]
+


setting :
the NMSettingVlan
 
map :
the type of priority map
from :
the priority to map to to
+
to :
the priority to map from to
Returns :
TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

 

 

 

@@ -617,8 +594,11 @@ Removes the priority map at index idx fr
 "ingress_priority_map" or "egress_priority_map"
 properties.
 

-

+

+++
@@ -636,6 +616,71 @@ properties.
 

 


 
 

 
setting :

 

 

+

+

+
nm_setting_vlan_clear_priorities ()

+
void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map);

+

+Clear all the entires from "ingress_priority_map" or
+"egress_priority_map" properties.
+

+

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




setting :
the NMSettingVlan
+
map :
the type of priority map

+

+

+

+
nm_setting_vlan_add_priority_str ()

+
gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         const char *str);

+

+Adds a priority map entry into either the "ingress_priority_map"
+or the "egress_priority_map" properties.  The priority map maps
+the Linux SKB priorities to 802.1p priorities.
+

+

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




setting :
the NMSettingVlan
+
map :
the type of priority map
str :
the string which contains a priority map, like "3:7"
Returns :
TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error

+

 

 

 
Property Details

@@ -708,6 +753,6 @@ hardware-specific setting, like 
 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index ee30d02e..00676582 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWimax
-
+
 
 
 
 
-
+
 
 
 
@@ -44,30 +44,30 @@
 
 #include <nm-setting-wimax.h>
 
-                    NMSettingWimax;
-                    NMSettingWimaxClass;
+#define             NM_SETTING_WIMAX_SETTING_NAME
 enum                NMSettingWimaxError;
 #define             NM_SETTING_WIMAX_ERROR
-#define             NM_SETTING_WIMAX_MAC_ADDRESS
-#define             NM_SETTING_WIMAX_NETWORK_NAME
-#define             NM_SETTING_WIMAX_SETTING_NAME
 GQuark              nm_setting_wimax_error_quark        (void);
-const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
-const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+#define             NM_SETTING_WIMAX_NETWORK_NAME
+#define             NM_SETTING_WIMAX_MAC_ADDRESS
+                    NMSettingWimax;
+                    NMSettingWimaxClass;
 NMSetting *         nm_setting_wimax_new                (void);
+const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWimaxError
+

 
   GObject
    +----NMSetting
          +----NMSettingWimax
 

-
-  GEnum
-   +----NMSettingWimaxError
-

 

 

 
Properties

@@ -86,17 +86,8 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 

 
Details

 

-
NMSettingWimax

-
typedef struct _NMSettingWimax NMSettingWimax;

-

-

-

-

-

-
NMSettingWimaxClass

-
typedef struct {
-	NMSettingClass parent;
-} NMSettingWimaxClass;
+
NM_SETTING_WIMAX_SETTING_NAME

+
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 

 

 

@@ -110,8 +101,11 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWimaxError;
 

-

+

+++
@@ -142,11 +136,21 @@ required
 

-
NM_SETTING_WIMAX_MAC_ADDRESS

-
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
-

+
nm_setting_wimax_error_quark ()

+
GQuark              nm_setting_wimax_error_quark        (void);

 

+Registers an error quark for NMSettingWimax if necessary.
 

+

 


 
 

 
NM_SETTING_WIMAX_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWimax errors.

 

 

 

@@ -158,37 +162,60 @@ required
 

 

 

-
NM_SETTING_WIMAX_SETTING_NAME

-
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
+
NM_SETTING_WIMAX_MAC_ADDRESS

+
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 

 

 

 

 

 

-
nm_setting_wimax_error_quark ()

-
GQuark              nm_setting_wimax_error_quark        (void);

+
NMSettingWimax

+
typedef struct _NMSettingWimax NMSettingWimax;

 

-Registers an error quark for NMSettingWimax if necessary.
 

-

+
+

+

+
NMSettingWimaxClass

+
typedef struct {
+	NMSettingClass parent;
+} NMSettingWimaxClass;
+

+

+

+

+

+

+
nm_setting_wimax_new ()

+
NMSetting *         nm_setting_wimax_new                (void);

+

+Creates a new NMSettingWimax object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingWimax errors.the new empty NMSettingWimax object
 

 

 

 

 

-
nm_setting_wimax_get_mac_address ()

-
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

+
nm_setting_wimax_get_network_name ()

+
const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);

 

-Returns the MAC address of a WiMAX device which this connection is locked
-to.
+Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
+specific WiMAX network this setting describes a connection to.
 

-

+

+++
@@ -197,21 +224,24 @@ to.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the MAC addressthe WiMAX NSP name
 

 
 

 

 

 

-
nm_setting_wimax_get_network_name ()

-
const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);

+
nm_setting_wimax_get_mac_address ()

+
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

 

-Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
-specific WiMAX network this setting describes a connection to.
+Returns the MAC address of a WiMAX device which this connection is locked
+to.
 

-

+

+++
@@ -220,26 +250,11 @@ specific WiMAX network this setting describes a connection to.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the WiMAX NSP namethe MAC address
 

 
 

 

-

-

-
nm_setting_wimax_new ()

-
NMSetting *         nm_setting_wimax_new                (void);

-

-Creates a new NMSettingWimax object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingWimax object

-

 

 

 
Property Details

@@ -266,6 +281,6 @@ should use.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index d56f053f..75d9cf16 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWired
-
+
 
 
 
 
-
+
 
 
 
@@ -44,38 +44,39 @@
 
 #include <nm-setting-wired.h>
 
-                    NMSettingWired;
-                    NMSettingWiredClass;
+#define             NM_SETTING_WIRED_SETTING_NAME
 enum                NMSettingWiredError;
-#define             NM_SETTING_WIRED_AUTO_NEGOTIATE
-#define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRED_DUPLEX
 #define             NM_SETTING_WIRED_ERROR
+GQuark              nm_setting_wired_error_quark        (void);
+#define             NM_SETTING_WIRED_PORT
+#define             NM_SETTING_WIRED_SPEED
+#define             NM_SETTING_WIRED_DUPLEX
+#define             NM_SETTING_WIRED_AUTO_NEGOTIATE
 #define             NM_SETTING_WIRED_MAC_ADDRESS
+#define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRED_MTU
-#define             NM_SETTING_WIRED_PORT
+#define             NM_SETTING_WIRED_S390_SUBCHANNELS
 #define             NM_SETTING_WIRED_S390_NETTYPE
 #define             NM_SETTING_WIRED_S390_OPTIONS
-#define             NM_SETTING_WIRED_S390_SUBCHANNELS
-#define             NM_SETTING_WIRED_SETTING_NAME
-#define             NM_SETTING_WIRED_SPEED
-gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);
-GQuark              nm_setting_wired_error_quark        (void);
+                    NMSettingWired;
+                    NMSettingWiredClass;
+NMSetting *         nm_setting_wired_new                (void);
+const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
+guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
+const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
 gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
+const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GByteArray *  nm_setting_wired_get_cloned_mac_address
                                                         (NMSettingWired *setting);
-const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
-const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);
 guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);
-guint32             nm_setting_wired_get_num_s390_options
+const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);
-const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
 const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);
+guint32             nm_setting_wired_get_num_s390_options
+                                                        (NMSettingWired *setting);
 gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
                                                          guint32 idx,
                                                          const char **out_key,
@@ -83,25 +84,24 @@ const char *        char *        nm_setting_wired_get_s390_option_by_key
                                                         (NMSettingWired *setting,
                                                          const char *key);
-const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);
-guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
-NMSetting *         nm_setting_wired_new                (void);
+gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);
 gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                                          const char *key);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWiredError
+

 
   GObject
    +----NMSetting
          +----NMSettingWired
 

-
-  GEnum
-   +----NMSettingWiredError
-

 

 

 
Properties

@@ -129,23 +129,8 @@ necessary for connection to Ethernet networks.
 

 
Details

 

-
NMSettingWired

-
typedef struct _NMSettingWired NMSettingWired;

-

-

-

-

-

-
NMSettingWiredClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWiredClass;
+
NM_SETTING_WIRED_SETTING_NAME

+
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

 

 

@@ -159,8 +144,11 @@ necessary for connection to Ethernet networks.
 	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWiredError;
 

-

+

+++
@@ -183,80 +171,90 @@ required
 

-
NM_SETTING_WIRED_AUTO_NEGOTIATE

-
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
+
NM_SETTING_WIRED_ERROR

+
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 

 

 

 

-
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
-

+
nm_setting_wired_error_quark ()

+
GQuark              nm_setting_wired_error_quark        (void);

 

+Registers an error quark for NMSettingWired if necessary.
 

+

 


 
 

 
NM_SETTING_WIRED_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWired errors.

 

 

 

-
NM_SETTING_WIRED_DUPLEX

-
#define NM_SETTING_WIRED_DUPLEX "duplex"
+
NM_SETTING_WIRED_PORT

+
#define NM_SETTING_WIRED_PORT "port"
 

 

 

 

 

 

-
NM_SETTING_WIRED_ERROR

-
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
+
NM_SETTING_WIRED_SPEED

+
#define NM_SETTING_WIRED_SPEED "speed"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
+
NM_SETTING_WIRED_DUPLEX

+
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+
NM_SETTING_WIRED_AUTO_NEGOTIATE

+
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MTU

-
#define NM_SETTING_WIRED_MTU "mtu"
+
NM_SETTING_WIRED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRED_PORT

-
#define NM_SETTING_WIRED_PORT "port"
+
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRED_S390_NETTYPE

-
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
+
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

 

 

 

 

 

-
NM_SETTING_WIRED_S390_OPTIONS

-
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
+
NM_SETTING_WIRED_MTU

+
#define NM_SETTING_WIRED_MTU "mtu"
 

 

 

@@ -271,50 +269,71 @@ required
 

 

 

-
NM_SETTING_WIRED_SETTING_NAME

-
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
+
NM_SETTING_WIRED_S390_NETTYPE

+
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

 

 

 

 

 

-
NM_SETTING_WIRED_SPEED

-
#define NM_SETTING_WIRED_SPEED "speed"
+
NM_SETTING_WIRED_S390_OPTIONS

+
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

 

 

 

 

 

-
nm_setting_wired_add_s390_option ()

-
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);

+
NMSettingWired

+
typedef struct _NMSettingWired NMSettingWired;

 

 

 

 

 

-
nm_setting_wired_error_quark ()

-
GQuark              nm_setting_wired_error_quark        (void);

+
NMSettingWiredClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWiredClass;
+

 

-Registers an error quark for NMSettingWired if necessary.
 

-

+
+

+

+
nm_setting_wired_new ()

+
NMSetting *         nm_setting_wired_new                (void);

+

+Creates a new NMSettingWired object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingWired errors.the new empty NMSettingWired object. [transfer full]
+
 

 

 

 

 

-
nm_setting_wired_get_auto_negotiate ()

-
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

-

+
nm_setting_wired_get_port ()

+
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

+

+++
@@ -323,18 +342,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "auto-negotiate" property of the settingthe "port" property of the setting
 

 
 

 

 

 

-
nm_setting_wired_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wired_get_cloned_mac_address
-                                                        (NMSettingWired *setting);

-

+
nm_setting_wired_get_speed ()

+
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

+

+++
@@ -343,7 +364,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "cloned-mac-address" property of the settingthe "speed" property of the setting
 

 
 

@@ -352,8 +373,11 @@ Registers an error quark for 
 
nm_setting_wired_get_duplex ()

 
const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);

-

+

+++
@@ -369,10 +393,35 @@ Registers an error quark for 
+
nm_setting_wired_get_auto_negotiate ()

+
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

+

 


 
 

 
setting :

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




setting :
the NMSettingWired
+
Returns :
the "auto-negotiate" property of the setting

+

+

+

 
nm_setting_wired_get_mac_address ()

 
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

-

+

+++
@@ -388,11 +437,37 @@ Registers an error quark for 
+
nm_setting_wired_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wired_get_cloned_mac_address
+                                                        (NMSettingWired *setting);

+

 


 
 

 
setting :

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




setting :
the NMSettingWired
+
Returns :
the "cloned-mac-address" property of the setting

+

+

+

 
nm_setting_wired_get_mac_address_blacklist ()

 
const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);

-

+

+++
@@ -412,8 +487,11 @@ property of the setting. [
 
nm_setting_wired_get_mtu ()

 
guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);

-

 


 
 

 
setting :

+

+++
@@ -429,16 +507,19 @@ property of the setting. [
-
nm_setting_wired_get_num_s390_options ()

-
guint32             nm_setting_wired_get_num_s390_options
+
nm_setting_wired_get_s390_subchannels ()

+
const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);

 

-Returns the number of s390-specific options that should be set for this
-device when it is activated.  This can be used to retrieve each s390
-option individually using nm_setting_wired_get_s390_option().
+Return the list of s390 subchannels that identify the device that this
+connection is applicable to.  The connection should only be used in
+conjunction with that device.
 

-

 


 
 

 
setting :

+

+++
@@ -447,17 +528,27 @@ option individually using Returns :

-
+

 


 
 

 
setting :
the number of s390-specific device options
+GPtrArray of strings, each specifying one
+subchannel the s390 device uses to communicate to the host. [element-type utf8]
+
 

 
 

 

 

 

-
nm_setting_wired_get_port ()

-
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

-

+
nm_setting_wired_get_s390_nettype ()

+
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

+

+Returns the s390 device type this connection should apply to.  Will be one
+of 'qeth', 'lcs', or 'ctc'.
+

+

+++
@@ -466,21 +557,26 @@ option individually using Returns :

-
+

 


 
 

 
setting :
the "port" property of the settingthe s390 device type
 

 
 

 

 

 

-
nm_setting_wired_get_s390_nettype ()

-
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

+
nm_setting_wired_get_num_s390_options ()

+
guint32             nm_setting_wired_get_num_s390_options
+                                                        (NMSettingWired *setting);

 

-Returns the s390 device type this connection should apply to.  Will be one
-of 'qeth', 'lcs', or 'ctc'.
+Returns the number of s390-specific options that should be set for this
+device when it is activated.  This can be used to retrieve each s390
+option individually using nm_setting_wired_get_s390_option().
 

-

+

+++
@@ -489,7 +585,7 @@ of 'qeth', 'lcs', or 'ctc'.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the s390 device typethe number of s390-specific device options
 

 
 

@@ -508,8 +604,11 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
 

-

+

+++
@@ -553,8 +652,11 @@ currently held by the setting)
 Returns the value associated with the s390-specific option specified by
 key, if it exists.
 

-

 


 
 

 
setting :

+

+++
@@ -567,7 +669,7 @@ Returns the value associated with the s390-specific option specified by
 
-
@@ -575,66 +677,12 @@ setting; the value is owned by the setting and must not be modified

-
nm_setting_wired_get_s390_subchannels ()

-
const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);

-

-Return the list of s390 subchannels that identify the device that this
-connection is applicable to.  The connection should only be used in
-conjunction with that device.
-

-

 


 
 

 
setting :

 

 
Returns :
the value, or NULL if the key/value pair was never added to the
+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
 

 
 
 
 

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


setting :
the NMSettingWired
-
Returns :

-GPtrArray of strings, each specifying one
-subchannel the s390 device uses to communicate to the host. [element-type utf8]
-

-

-

-

-
nm_setting_wired_get_speed ()

-
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

-

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


setting :
the NMSettingWired
-
Returns :
the "speed" property of the setting

-

-

-

-
nm_setting_wired_new ()

-
NMSetting *         nm_setting_wired_new                (void);

+
nm_setting_wired_add_s390_option ()

+
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);

 

-Creates a new NMSettingWired object with default values.
 

-

--
-
-
-
-


Returns :
the new empty NMSettingWired object. [transfer full]
-

 

 

 

@@ -755,6 +803,7 @@ composed of hexadecimal characters and the period (.) character.
 
  "speed"                    guint                 : Read / Write / Construct

 

 If non-zero, request that the device use only the specified speed.
+
 In Mbit/s, ie 100 == 100Mbit/s.
 

 
Default value: 0

@@ -763,6 +812,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 3a144270..a792acc9 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWireless
-
+
 
 
 
 
-
+
 
 
 
@@ -44,71 +44,71 @@
 
 #include <nm-setting-wireless.h>
 
-                    NMSettingWireless;
-                    NMSettingWirelessClass;
+#define             NM_SETTING_WIRELESS_SETTING_NAME
 enum                NMSettingWirelessError;
+#define             NM_SETTING_WIRELESS_ERROR
+GQuark              nm_setting_wireless_error_quark     (void);
+#define             NM_SETTING_WIRELESS_SSID
+#define             NM_SETTING_WIRELESS_MODE
 #define             NM_SETTING_WIRELESS_BAND
-#define             NM_SETTING_WIRELESS_BSSID
 #define             NM_SETTING_WIRELESS_CHANNEL
-#define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRELESS_ERROR
-#define             NM_SETTING_WIRELESS_HIDDEN
+#define             NM_SETTING_WIRELESS_BSSID
+#define             NM_SETTING_WIRELESS_RATE
+#define             NM_SETTING_WIRELESS_TX_POWER
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS
+#define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-#define             NM_SETTING_WIRELESS_MODE
+#define             NM_SETTING_WIRELESS_MTU
+#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
+#define             NM_SETTING_WIRELESS_SEC
+#define             NM_SETTING_WIRELESS_HIDDEN
 #define             NM_SETTING_WIRELESS_MODE_ADHOC
 #define             NM_SETTING_WIRELESS_MODE_AP
 #define             NM_SETTING_WIRELESS_MODE_INFRA
-#define             NM_SETTING_WIRELESS_MTU
-#define             NM_SETTING_WIRELESS_RATE
-#define             NM_SETTING_WIRELESS_SEC
-#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
-#define             NM_SETTING_WIRELESS_SETTING_NAME
-#define             NM_SETTING_WIRELESS_SSID
-#define             NM_SETTING_WIRELESS_TX_POWER
-gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);
-gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
-GQuark              nm_setting_wireless_error_quark     (void);
+                    NMSettingWireless;
+                    NMSettingWirelessClass;
+NMSetting *         nm_setting_wireless_new             (void);
+const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
 const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
 guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);
+const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
+const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 const GByteArray *  nm_setting_wireless_get_cloned_mac_address
                                                         (NMSettingWireless *setting);
-gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
 guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
+gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);
+gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);
 guint32             nm_setting_wireless_get_num_seen_bssids
                                                         (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
 const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);
-const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
-NMSetting *         nm_setting_wireless_new             (void);
+gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWirelessError
+

 
   GObject
    +----NMSetting
          +----NMSettingWireless
 

-
-  GEnum
-   +----NMSettingWirelessError
-

 

 

 
Properties

@@ -139,23 +139,8 @@ necessary for connection to 802.11 WiFi networks.
 

 
Details

 

-
NMSettingWireless

-
typedef struct _NMSettingWireless NMSettingWireless;

-

-

-

-

-

-
NMSettingWirelessClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessClass;
+
NM_SETTING_WIRELESS_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

 

 

@@ -171,8 +156,11 @@ necessary for connection to 802.11 WiFi networks.
 	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
 } NMSettingWirelessError;
 

-

+

+++
@@ -207,104 +195,108 @@ set to a value that requires the 
-
NM_SETTING_WIRELESS_BAND

-
#define NM_SETTING_WIRELESS_BAND        "band"
+
NM_SETTING_WIRELESS_ERROR

+
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 

 

 

 
 

 

-
NM_SETTING_WIRELESS_BSSID

-
#define NM_SETTING_WIRELESS_BSSID       "bssid"
-

+
nm_setting_wireless_error_quark ()

+
GQuark              nm_setting_wireless_error_quark     (void);

 

+Registers an error quark for NMSettingWireless if necessary.
 

+

 


 
 

 
NM_SETTING_WIRELESS_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWireless errors.

 

 

 

-
NM_SETTING_WIRELESS_CHANNEL

-
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
+
NM_SETTING_WIRELESS_SSID

+
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
+
NM_SETTING_WIRELESS_MODE

+
#define NM_SETTING_WIRELESS_MODE        "mode"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_ERROR

-
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
+
NM_SETTING_WIRELESS_BAND

+
#define NM_SETTING_WIRELESS_BAND        "band"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_HIDDEN

-
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
+
NM_SETTING_WIRELESS_CHANNEL

+
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
+
NM_SETTING_WIRELESS_BSSID

+
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+
NM_SETTING_WIRELESS_RATE

+
#define NM_SETTING_WIRELESS_RATE        "rate"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MODE

-
#define NM_SETTING_WIRELESS_MODE        "mode"
+
NM_SETTING_WIRELESS_TX_POWER

+
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MODE_ADHOC

-
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+
NM_SETTING_WIRELESS_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

 

-Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_MODE_AP

-
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

-Indicates AP/master mode where the wireless device is started as an access
-point/hotspot.
 

-
Since 0.9.8

 

 

 

-
NM_SETTING_WIRELESS_MODE_INFRA

-
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

 

-Indicates infrastructure mode where an access point is expected to be present
-for this connection.
 

 

 

@@ -317,8 +309,8 @@ for this connection.
 

 

 

-
NM_SETTING_WIRELESS_RATE

-
#define NM_SETTING_WIRELESS_RATE        "rate"
+
NM_SETTING_WIRELESS_SEEN_BSSIDS

+
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

 

 

@@ -333,49 +325,93 @@ for this connection.
 

 

 

-
NM_SETTING_WIRELESS_SEEN_BSSIDS

-
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
+
NM_SETTING_WIRELESS_HIDDEN

+
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
+
NM_SETTING_WIRELESS_MODE_ADHOC

+
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
 

 

+Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_SSID

-
#define NM_SETTING_WIRELESS_SSID        "ssid"
+
NM_SETTING_WIRELESS_MODE_AP

+
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
 

 

+Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.
 

+
Since 0.9.8

 

 

 

-
NM_SETTING_WIRELESS_TX_POWER

-
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+
NM_SETTING_WIRELESS_MODE_INFRA

+
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
 

 

+Indicates infrastructure mode where an access point is expected to be present
+for this connection.
 

 

 

 

-
nm_setting_wireless_add_seen_bssid ()

-
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);

+
NMSettingWireless

+
typedef struct _NMSettingWireless NMSettingWireless;

 

-Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager now tracks previously seen BSSIDs internally so this function
-no longer has much use. Actually, changes you make using this function will
-not be preserved.
 

-

+
+

+

+
NMSettingWirelessClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessClass;
+

+

+

+

+

+

+
nm_setting_wireless_new ()

+
NMSetting *         nm_setting_wireless_new             (void);

+

+Creates a new NMSettingWireless object with default values.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMSettingWireless object. [transfer full]
+

+

+

+

+
nm_setting_wireless_get_ssid ()

+
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

+

+++
@@ -383,96 +419,65 @@ not be preserved.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
bssid :
the new BSSID to add to the list

 
Returns :

-TRUE if bssid was already known, FALSE if notthe "ssid" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_ap_security_compatible ()

-
gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);

-

-Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
-determine if the configuration given by the settings is compatible with
-the security of an access point using that access point's capability flags
-and mode.  Useful for clients that wish to filter a set of connections
-against a set of access points and determine which connections are
-compatible with which access points.
-

-

+
nm_setting_wireless_get_mode ()

+
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

+

+++
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
 
s_wireless :
a NMSettingWireless
-
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
setting :
the NMSettingWireless
 
 

 
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
-capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
-capabilities
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure

 
Returns :

-TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.the "mode" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_error_quark ()

-
GQuark              nm_setting_wireless_error_quark     (void);

-

-Registers an error quark for NMSettingWireless if necessary.
-

-

+
nm_setting_wireless_get_band ()

+
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingWireless
+

 
Returns :
the error quark used for NMSettingWireless errors.
the "band" property of the setting

 

 

 

 

-
nm_setting_wireless_get_band ()

-
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_channel ()

+
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

+

+++
@@ -481,7 +486,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "band" property of the settingthe "channel" property of the setting
 

 
 

@@ -490,8 +495,11 @@ Registers an error quark for 
 
nm_setting_wireless_get_bssid ()

 
const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);

-

+

+++
@@ -507,10 +515,13 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_channel ()

-
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_get_rate ()

+
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

+

+++
@@ -519,18 +530,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "channel" property of the settingthe "rate" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_tx_power ()

+
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

+

+++
@@ -539,17 +552,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "cloned-mac-address" property of the settingthe "tx-power" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_hidden ()

-
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_mac_address ()

+
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

+

+++
@@ -558,17 +574,21 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "hidden" property of the settingthe "mac-address" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
+                                                        (NMSettingWireless *setting);

+

+++
@@ -577,7 +597,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mac-address" property of the settingthe "cloned-mac-address" property of the setting
 

 
 

@@ -587,8 +607,11 @@ Registers an error quark for 
nm_setting_wireless_get_mac_address_blacklist ()

 
const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);

-

+

+++
@@ -606,10 +629,13 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_mode ()

-
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_get_mtu ()

+
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

+

+++
@@ -618,17 +644,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mode" property of the settingthe "mtu" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_mtu ()

-
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_security ()

+
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

+

+++
@@ -637,18 +666,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mtu" property of the settingthe "security" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_num_seen_bssids ()

-
guint32             nm_setting_wireless_get_num_seen_bssids
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_hidden ()

+
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

+

+++
@@ -657,17 +688,27 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the number of BSSIDs in the previously seen BSSID listthe "hidden" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_rate ()

-
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

-

+
nm_setting_wireless_add_seen_bssid ()

+
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);

+

+Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager now tracks previously seen BSSIDs internally so this function
+no longer has much use. Actually, changes you make using this function will
+not be preserved.
+

+

+++
@@ -675,18 +716,27 @@ Registers an error quark for 
 
+
+
+
+
-
+

 


 
 

 
setting :

 
bssid :
the new BSSID to add to the list

 
Returns :
the "rate" property of the setting
+TRUE if bssid was already known, FALSE if not
 

 
 

 

 

 

-
nm_setting_wireless_get_security ()

-
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_num_seen_bssids ()

+
guint32             nm_setting_wireless_get_num_seen_bssids
+                                                        (NMSettingWireless *setting);

+

+++
@@ -695,7 +745,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "security" property of the settingthe number of BSSIDs in the previously seen BSSID list
 

 
 

@@ -705,8 +755,11 @@ Registers an error quark for 
nm_setting_wireless_get_seen_bssid ()

 
const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);

-

+

+++
@@ -727,58 +780,65 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_ssid ()

-
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_ap_security_compatible ()

+
gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);

+

+Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
+determine if the configuration given by the settings is compatible with
+the security of an access point using that access point's capability flags
+and mode.  Useful for clients that wish to filter a set of connections
+against a set of access points and determine which connections are
+compatible with which access points.
+

+

+++
-
-
+
-
-
+
+
-
-

 


 
 
setting :
the NMSettingWireless
+
s_wireless :
a NMSettingWireless
 
 

 
Returns :
the "ssid" property of the setting
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
 

-

-

-

-
nm_setting_wireless_get_tx_power ()

-
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

-

--
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+


 
setting :
the NMSettingWireless
-
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
+capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
+capabilities
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure
 

 

 
Returns :
the "tx-power" property of the setting
+TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.
 

 
 

 

-

-

-
nm_setting_wireless_new ()

-
NMSetting *         nm_setting_wireless_new             (void);

-

-Creates a new NMSettingWireless object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingWireless object. [transfer full]
-

-

 

 

 
Property Details

@@ -855,10 +915,9 @@ of the device (i.e. MAC spoofing).
 
The "mac-address-blacklist" property

 
  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write

 

-If specified, this connection will never apply to the WiFi device
-whose permanent MAC address matches an address in the list.  Each
-MAC address is in the standard hex-digits-and-colons notation.
-(00:11:22:33:44:55).
+A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
 

 

 

@@ -939,6 +998,6 @@ devices support setting a static transmit power.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 94ff1432..bdde2c5b 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWirelessSecurity
-
+
 
 
 
 
-
+
 
 
 
@@ -45,107 +45,102 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 #include <nm-setting-wireless-security.h>
 
-                    NMSettingWirelessSecurity;
-                    NMSettingWirelessSecurityClass;
+#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 enum                NMSettingWirelessSecurityError;
+#define             NM_SETTING_WIRELESS_SECURITY_ERROR
+GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);
 enum                NMWepKeyType;
+#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 #define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-#define             NM_SETTING_WIRELESS_SECURITY_ERROR
+#define             NM_SETTING_WIRELESS_SECURITY_PROTO
+#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
 #define             NM_SETTING_WIRELESS_SECURITY_GROUP
-#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-#define             NM_SETTING_WIRELESS_SECURITY_PROTO
-#define             NM_SETTING_WIRELESS_SECURITY_PSK
-#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 #define             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_WEP_TX_KEYIDX
-gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);
-gboolean            nm_setting_wireless_security_add_pairwise
+#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_LEAP_PASSWORD_FLAGS
+                    NMSettingWirelessSecurity;
+                    NMSettingWirelessSecurityClass;
+NMSetting *         nm_setting_wireless_security_new    (void);
+const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);
+guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);
+                                                         guint32 i);
 gboolean            nm_setting_wireless_security_add_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *proto);
-void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);
-void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
+void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
 void                nm_setting_wireless_security_clear_protos
                                                         (NMSettingWirelessSecurity *setting);
-GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);
-const char *        nm_setting_wireless_security_get_auth_alg
+guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_group
+const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (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_leap_username
+gboolean            nm_setting_wireless_security_add_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *pairwise);
+void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
+void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);
 guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_pairwise
+const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-const char *        nm_setting_wireless_security_get_proto
+gboolean            nm_setting_wireless_security_add_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *group);
+void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
+void                nm_setting_wireless_security_clear_groups
+                                                        (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_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);
-NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);
-NMSetting *         nm_setting_wireless_security_new    (void);
-void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_remove_proto
+const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
+                                                         guint32 idx);
 void                nm_setting_wireless_security_set_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx,
                                                          const char *key);
+guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+                                                        (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

-
-  GObject
-   +----NMSetting
-         +----NMSettingWirelessSecurity
-

 
   GEnum
    +----NMSettingWirelessSecurityError
@@ -154,6 +149,11 @@ const char *        
+  GObject
+   +----NMSetting
+         +----NMSettingWirelessSecurity
+

 

 

 
Properties

@@ -203,23 +203,8 @@ of how WiFi security works, you may want to get copies of the following books.
 

 
Details

 

-
NMSettingWirelessSecurity

-
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

-

-

-

-

-

-
NMSettingWirelessSecurityClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessSecurityClass;
+
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

 

 

@@ -237,8 +222,11 @@ of how WiFi security works, you may want to get copies of the following books.
 	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
 } NMSettingWirelessSecurityError;
 

-

+

+++
@@ -286,6 +274,33 @@ encryption protocol
 

+
NM_SETTING_WIRELESS_SECURITY_ERROR

+
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+

+

+

+

+

+

+
nm_setting_wireless_security_error_quark ()

+
GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);

+

+Registers an error quark for NMSettingWired if necessary.
+

+

 


 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWired errors.

+

+

+

 
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -306,8 +321,11 @@ ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
 keys are hashed differently to determine the actual WEP key the type must be
 specified.
 

-

+

+++
@@ -340,48 +358,48 @@ the actual WEP key using the MD5 hash algorithm.
 

-
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

-
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
+
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

+
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_ERROR

-
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_GROUP

-
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
+
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

+
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

-
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
+
NM_SETTING_WIRELESS_SECURITY_PROTO

+
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
+
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

+
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
+
NM_SETTING_WIRELESS_SECURITY_GROUP

+
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

 

 

@@ -396,148 +414,184 @@ the actual WEP key using the MD5 hash algorithm.
 

-
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

-
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PROTO

-
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK

-
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
+
NM_SETTING_WIRELESS_SECURITY_PSK

+
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
+
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
-

+
NMSettingWirelessSecurity

+
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
+
NMSettingWirelessSecurityClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessSecurityClass;
 

 

 

 

-
nm_setting_wireless_security_add_group ()

-
gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);

+
nm_setting_wireless_security_new ()

+
NMSetting *         nm_setting_wireless_security_new    (void);

 

-Adds an encryption algorithm to the list of allowed groupwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
+Creates a new NMSettingWirelessSecurity object with default values.
 

-

 


 
 

 
NM_WEP_KEY_TYPE_UNKNOWN

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

+

+-
-
-
-
-
++
+
+
+
+
+

 

setting :
the NMSettingWirelessSecurity
-


Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
+

+

+

+

+
nm_setting_wireless_security_get_key_mgmt ()

+
const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);

+

++++
+
-
-
+
+
-
+




 
group :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
setting :
the NMSettingWirelessSecurity
+
 

 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe "key-mgmt" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_add_pairwise ()

-
gboolean            nm_setting_wireless_security_add_pairwise
+
nm_setting_wireless_security_get_num_protos ()

+
guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);

+

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




setting :
the NMSettingWirelessSecurity
+
Returns :
the number of security protocols this connection allows when
+connecting to secure WiFi networks

+

+

+

+
nm_setting_wireless_security_get_proto ()

+
const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);

-

-Adds an encryption algorithm to the list of allowed pairwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

-

+                                                         guint32 i);
+

+++
@@ -545,15 +599,13 @@ compatible with this connection.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
i :
an index into the protocol list
 

 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe protocol at index i
+
 

 
 

@@ -572,8 +624,11 @@ protocol list contains only "wpa" but the access point for the SSID specified
 by this connection only supports WPA2/RSN, the connection cannot be used
 with the access point.
 

-

+

+++
@@ -595,38 +650,29 @@ protocol list, or 
-
nm_setting_wireless_security_clear_groups ()

-
void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all groupwise encryption algorithms are allowed.
-

-

 


 
 

 
setting :

--
-
-
-
-


setting :
the NMSettingWirelessSecurity
-

-

-

-

-
nm_setting_wireless_security_clear_pairwise ()

-
void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_remove_proto ()

+
void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

 

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all pairwise encryption algorithms are allowed.
+Removes a protocol from the allowed protocol list.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingWirelessSecurity
 
i :
index of the protocol to remove

 

 

 

@@ -638,8 +684,11 @@ specified then all pairwise encryption algorithms are allowed.
 Removes all protocols from the allowed list.  If there are no protocols
 specified then all protocols are allowed.
 

-

+

+++

 


 

 
setting :

 the NMSettingWirelessSecurity
@@ -649,27 +698,14 @@ specified then all protocols are allowed.
 
 

 

-
nm_setting_wireless_security_error_quark ()

-
GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);

-

-Registers an error quark for NMSettingWired if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingWired errors.

-

-

-

-
nm_setting_wireless_security_get_auth_alg ()

-
const char *        nm_setting_wireless_security_get_auth_alg
+
nm_setting_wireless_security_get_num_pairwise ()

+
guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -678,23 +714,26 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "auth-alg" property of the settingthe number of pairwise encryption algorithms in the allowed list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_group ()

-
const char *        nm_setting_wireless_security_get_group
+
nm_setting_wireless_security_get_pairwise ()

+
const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Returns the allowed groupwise encryption algorithm from allowed algorithm
+Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
 

-

+

+++
@@ -703,11 +742,11 @@ list.
 
-
+
-
@@ -715,11 +754,21 @@ list.
 

-
nm_setting_wireless_security_get_key_mgmt ()

-
const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 

 
i :
index of an item in the allowed groupwise encryption algorithm listindex of an item in the allowed pairwise encryption algorithm list
 

 

 
Returns :
the groupwise encryption algorithm at index i
+the pairwise encryption algorithm at index i
 
 

 
 
 

+
nm_setting_wireless_security_add_pairwise ()

+
gboolean            nm_setting_wireless_security_add_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *pairwise);

+

+Adds an encryption algorithm to the list of allowed pairwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
+

+

+++
@@ -727,39 +776,34 @@ list.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :
the "key-mgmt" property of the setting

-

-

-

-
nm_setting_wireless_security_get_leap_password ()

-
const char *        nm_setting_wireless_security_get_leap_password
-                                                        (NMSettingWirelessSecurity *setting);

-

--
-
-
-
+
+
-
+


setting :
the NMSettingWirelessSecurity
-
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 

 

 
Returns :
the "leap-password" property of the setting
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_remove_pairwise ()

+
void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Removes an encryption algorithm from the allowed pairwise encryption
+algorithm list.
+

+

+++
@@ -767,32 +811,31 @@ list.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"leap-password"
-
i :
the index of an item in the allowed pairwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_username ()

-
const char *        nm_setting_wireless_security_get_leap_username
+
nm_setting_wireless_security_clear_pairwise ()

+
void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);

-

+

+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all pairwise encryption algorithms are allowed.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingWirelessSecurity
 
Returns :
the "leap-username" property of the setting

 

 

 

@@ -800,8 +843,11 @@ list.
 
nm_setting_wireless_security_get_num_groups ()

 
guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -817,11 +863,19 @@ list.
 

-
nm_setting_wireless_security_get_num_pairwise ()

-
guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 
 

+
nm_setting_wireless_security_get_group ()

+
const char *        nm_setting_wireless_security_get_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Returns the allowed groupwise encryption algorithm from allowed algorithm
+list.
+

+

+++
@@ -829,19 +883,34 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
i :
index of an item in the allowed groupwise encryption algorithm list

 
Returns :
the number of pairwise encryption algorithms in the allowed listthe groupwise encryption algorithm at index i
+
 

 
 

 
 

 

-
nm_setting_wireless_security_get_num_protos ()

-
guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_add_group ()

+
gboolean            nm_setting_wireless_security_add_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *group);

+

+Adds an encryption algorithm to the list of allowed groupwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
+

+

+++
@@ -849,25 +918,34 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
group :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"

 
Returns :
the number of security protocols this connection allows when
-connecting to secure WiFi networks
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_pairwise ()

-
const char *        nm_setting_wireless_security_get_pairwise
+
nm_setting_wireless_security_remove_group ()

+
void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Returns the allowed pairwise encryption algorithm from allowed algorithm
-list.
+Removes an encryption algorithm from the allowed groupwise encryption
+algorithm list.
 

-

+

+++
@@ -876,40 +954,30 @@ list.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
i :
index of an item in the allowed pairwise encryption algorithm list
Returns :
the pairwise encryption algorithm at index i
-the index of an item in the allowed groupwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_proto ()

-
const char *        nm_setting_wireless_security_get_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

+
nm_setting_wireless_security_clear_groups ()

+
void                nm_setting_wireless_security_clear_groups
+                                                        (NMSettingWirelessSecurity *setting);

+

+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all groupwise encryption algorithms are allowed.
+

+

+-
-
++
+
-
-
-
-
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingWirelessSecurity
 
i :
an index into the protocol list
Returns :
the protocol at index i
-

 

 

 

@@ -917,8 +985,11 @@ list.
 
nm_setting_wireless_security_get_psk ()

 
const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -937,8 +1008,11 @@ list.
 
nm_setting_wireless_security_get_psk_flags ()
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -956,12 +1030,14 @@ list.
 

-
nm_setting_wireless_security_get_wep_key ()

-
const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);

-

 


 
 

 
setting :

 
 

+
nm_setting_wireless_security_get_leap_username ()

+
const char *        nm_setting_wireless_security_get_leap_username
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -969,23 +1045,22 @@ list.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the WEP key at the given indexthe "leap-username" property of the setting
 

 
 

 
 

 

-
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+
nm_setting_wireless_security_get_leap_password ()

+
const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -994,18 +1069,21 @@ list.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keysthe "leap-password" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+
nm_setting_wireless_security_get_leap_password_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -1014,18 +1092,24 @@ list.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "wep-key-type" property of the settingthe NMSettingSecretFlags pertaining to the
+"leap-password"
+
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_wep_key ()

+
const char *        nm_setting_wireless_security_get_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx);

+

+++
@@ -1033,40 +1117,60 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the "wep-tx-keyidx" property of the settingthe WEP key at the given index
 

 
 

 

 

 

-
nm_setting_wireless_security_new ()

-
NMSetting *         nm_setting_wireless_security_new    (void);

+
nm_setting_wireless_security_set_wep_key ()

+
void                nm_setting_wireless_security_set_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx,
+                                                         const char *key);

 

-Creates a new NMSettingWirelessSecurity object with default values.
+Sets a WEP key in the given index.
 

-

+

+-
-
-+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+

 

Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
+


setting :
the NMSettingWirelessSecurity
 
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
+form as determiend by the value of the "wep-key-type"
+property.

 

 

 

 

-
nm_setting_wireless_security_remove_group ()

-
void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed groupwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_get_wep_tx_keyidx ()

+
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1074,24 +1178,22 @@ algorithm list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of an item in the allowed groupwise encryption algorithm list
Returns :
the "wep-tx-keyidx" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_pairwise ()

-
void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed pairwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_get_auth_alg ()

+
const char *        nm_setting_wireless_security_get_auth_alg
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1099,23 +1201,22 @@ algorithm list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of an item in the allowed pairwise encryption algorithm list
Returns :
the "auth-alg" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_proto ()

-
void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes a protocol from the allowed protocol list.
-

-

+
nm_setting_wireless_security_get_wep_key_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1123,24 +1224,22 @@ Removes a protocol from the allowed protocol list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index of the protocol to remove
Returns :
the NMSettingSecretFlags pertaining to the all WEP keys
 

 
 

 

 

 

-
nm_setting_wireless_security_set_wep_key ()

-
void                nm_setting_wireless_security_set_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx,
-                                                         const char *key);

-

-Sets a WEP key in the given index.
-

-

+
nm_setting_wireless_security_get_wep_key_type ()

+
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1148,14 +1247,8 @@ Sets a WEP key in the given index.
 
-
-
-
-
-
-
+
+

 


 
 

 
setting :

 

 
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
-form as determiend by the value of the "wep-key-type"
-property.
Returns :
the "wep-key-type" property of the setting
 

 
 

@@ -1180,9 +1273,10 @@ the 'leap-username' and 'leap-password' properties must be specified.
 
The "group" property

 
  "group"                    GSList_gchararray_*   : Read / Write

 

-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'.
+A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

@@ -1232,9 +1326,10 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 
The "pairwise" property

 
  "pairwise"                 GSList_gchararray_*   : Read / Write

 

-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'.
+A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.  For
+maximum compatibility leave this property empty.  Each list element may
+be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 
 

@@ -1353,6 +1448,6 @@ Linksys WRT54G) number the keys 1 - 4.
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ 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 b9117001..ae9452da 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 
 
 Annotation Glossary
-
+
 
 
 
-
+
 
 
 
@@ -20,58 +20,53 @@
 		 
 

 

-O
+I
                       | 
                    A
                       | 
-                   I
+                   T
                       | 
-                   E
+                   O
+                      | 
+                   S
                       | 
                    T
                       | 
-                   S
+                   E
                       | 
                    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.

+

+Annotation Glossary

 
I

-

-inout

-
Parameter for input and for returning results. Default is transfer full.

-
E

-

-element-type

-
Generics and defining elements of containers and arrays.

+
inout

+
Parameter for input and for returning results. Default is transfer full.

+
A

+
allow-none

+
NULL is ok, both for passing and for returning.

 
T

-

-transfer container

-
Free data container after the code is done.

+
transfer container

+
Free data container after the code is done.

+
O

+
out

+
Parameter for returning results. Default is transfer full.

 
S

-

-scope call

-
The callback is valid only during the call to the method.

+
scope call

+
The callback is valid only during the call to the method.

+
T

+
transfer none

+
Don't free data after the code is done.

+
E

+
element-type

+
Generics and defining elements of containers and arrays.

 
T

-

-transfer full

-
Free data after the code is done.

-

-transfer none

-
Don't free data after the code is done.

+
transfer full

+
Free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ 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 b3f8aa63..9d53c16b 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -3,12 +3,12 @@
 
 
 API Index
-
+
 
 
 
 
-
+
 
 
 
@@ -35,8 +35,8 @@
 
 
 

-

-API Index

+

+API Index

 
C

 

 NMConnection, struct in NMConnection
@@ -589,6 +589,14 @@
 

 

 

+NMSetting8021x:pin, object property in NMSetting8021x
+

+

+

+NMSetting8021x:pin-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:private-key, object property in NMSetting8021x
 

 

@@ -4242,6 +4250,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 5223862e..5b79f668 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -3,12 +3,12 @@
 
 
 libnm-util API Reference
-
+
 
 
 
 
-
+
 
 
 
@@ -20,9 +20,9 @@
 Next
 
 

-

-libnm-util API Reference

-

+

+libnm-util API Reference

+

 

 NMConnection — Describes a connection to specific network or provider
 

@@ -105,6 +105,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 667c695c..a7e470a3 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -3,10 +3,10 @@
 
 
 libnm-util Reference Manual
-
+
 
 
-
+
 
 
 
@@ -15,14 +15,14 @@
 

 

 

-      for libnm-util 0.9.8.0
+      for libnm-util 0.9.8.8
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

 
Copyright © 2012 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
@@ -46,7 +46,7 @@
 

 

 

-

+

 
libnm-util API Reference

 

 

@@ -135,6 +135,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 604f2d9b..203b6e1b 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -7,35 +7,48 @@
 
 
 
-
-
 
 
 
 
 
 
+
 
+
+
+
+
+
+
 
-
-
+
+
+
+
 
-
 
-
-
-
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
 
-
-
 
-
 
 
 
 
-
 
 
 
@@ -46,26 +59,13 @@
 
 
 
-
 
 
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
@@ -73,67 +73,67 @@
 
 
 
-
-
 
-
 
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
 
 
-
-
-
-
+
+
+
+
+
+
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
-
 
-
-
-
-
-
-
-
-
 
+
+
+
 
-
+
+
+
 
 
 
@@ -143,47 +143,47 @@
 
 
 
-
-
+
 
 
 
 
 
 
-
 
+
 
-
-
-
-
-
-
-
-
 
+
+
+
+
+
 
-
-
-
-
-
+
+
+
+
+
+
 
-
+
+
+
+
+
 
-
 
-
-
-
-
-
 
-
-
 
+
 
+
+
+
+
+
+
 
 
 
@@ -204,41 +204,41 @@
 
 
 
-
-
+
 
 
 
 
-
-
-
 
+
+
+
+
+
 
+
 
 
-
+
 
 
-
-
-
-
-
-
-
+
+
+
+
+
 
+
 
+
 
 
-
-
+
 
+
 
 
-
-
-
+
 
 
 
@@ -259,52 +259,52 @@
 
 
 
-
-
+
 
 
 
 
 
 
+
+
+
+
 
-
 
-
-
-
+
+
+
 
+
 
-
+
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
 
-
 
-
-
+
+
+
 
+
 
-
 
-
-
 
+
+
+
 
-
-
-
+
 
 
 
@@ -328,8 +328,7 @@
 
 
 
-
-
+
 
 
 
@@ -338,59 +337,60 @@
 
 
 
+
+
 
 
 
 
 
+
+
 
-
+
+
 
-
-
-
 
-
-
-
-
-
 
 
 
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
+
 
-
-
-
-
-
-
-
-
 
-
 
-
+
+
+
+
+
+
+
+
 
 
+
+
+
 
+
+
+
 
 
-
-
-
-
-
-
 
 
 
@@ -416,23 +416,23 @@
 
 
 
-
-
+
 
 
 
 
 
-
 
-
+
+
 
 
 
-
+
+
+
 
 
-
 
 
 
@@ -443,27 +443,27 @@
 
 
 
-
-
+
 
 
 
 
 
+
+
 
 
-
 
-
-
 
-
+
+
+
+
 
 
 
-
 
-
+
 
 
 
@@ -477,25 +477,25 @@
 
 
 
-
-
+
 
 
 
 
 
 
+
 
+
 
 
-
-
-
+
+
+
 
+
 
 
-
-
 
 
 
@@ -504,19 +504,39 @@
 
 
 
-
 
+
 
 
 
 
-
-
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -533,40 +553,20 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
-
 
 
-
-
-
+
 
+
 
-
-
+
 
 
 
@@ -586,20 +586,20 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
-
 
-
-
+
+
+
+
 
+
+
 
 
 
@@ -610,8 +610,7 @@
 
 
 
-
-
+
 
 
 
@@ -619,25 +618,26 @@
 
 
 
+
 
 
-
-
-
-
 
+
+
 
-
-
-
+
+
+
+
+
 
 
 
 
-
-
-
+
 
+
+
 
 
 
@@ -648,30 +648,30 @@
 
 
 
-
-
+
 
 
 
 
-
 
+
+
+
+
 
 
-
 
-
-
-
-
-
+
+
+
+
+
+
+
 
 
-
 
-
-
-
+
 
 
 
@@ -687,22 +687,22 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
-
-
 
-
-
-
+
+
+
+
+
 
+
+
+
 
 
 
@@ -714,22 +714,22 @@
 
 
 
-
-
+
 
 
 
 
 
+
 
 
-
 
-
+
+
+
 
 
 
-
 
 
 
@@ -737,46 +737,46 @@
 
 
 
-
 
+
 
 
 
 
-
-
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
-
 
+
+
+
 
-
+
 
+
+
 
 
 
@@ -791,22 +791,22 @@
 
 
 
-
-
+
 
 
 
 
-
-
 
-
-
 
+
+
+
+
+
+
+
 
 
-
-
 
 
 
@@ -818,35 +818,35 @@
 
 
 
-
-
+
 
 
 
 
-
-
-
 
+
+
 
 
 
-
+
+
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
 
-
-
+
 
-
+
+
 
 
 
@@ -864,7 +864,6 @@
 
 
 
-
 
 
 
@@ -874,111 +873,112 @@
 
 
 
-
+
 
 
 
 
-
+
+
+
+
 
+
 
 
+
+
 
-
-
-
-
-
-
-
-
-
-
 
-
+
+
 
 
 
 
+
+
 
+
+
+
+
+
+
+
 
 
 
-
 
 
-
-
-
-
-
 
-
+
+
+
+
+
 
-
-
+
 
-
-
-
+
 
+
+
+
+
+
 
 
-
-
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
-
+
+
 
 
+
 
 
-
-
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
 
 
+
 
-
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
 
-
+
+
+
 
 
 
@@ -1005,6 +1005,8 @@
 
 
 
+
+
 
 
 
@@ -1012,95 +1014,95 @@
 
 
 
+
 
 
-
 
 
 
 
-
-
-
-
+
 
 
 
 
 
+
+
+
+
+
 
+
+
+
 
-
 
-
-
-
-
-
+
+
 
-
 
-
 
 
 
-
-
-
-
-
-
-
-
+
+
 
+
 
+
+
+
 
-
+
 
-
-
-
-
-
-
-
+
+
+
 
+
 
+
+
+
 
-
-
+
 
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
+
+
+
 
-
-
+
+
+
+
 
 
-
-
-
-
+
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1116,100 +1118,100 @@
 
 
 
-
-
 
 
+
+
 
 
 
 
-
-
-
-
+
 
 
 
 
 
-
-
-
-
-
-
-
+
+
+
 
 
-
-
+
+
 
-
+
+
 
-
+
+
+
 
 
-
 
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
+
 
+
+
+
 
-
+
 
-
-
-
-
-
-
-
+
+
+
 
+
 
+
+
+
 
-
-
+
 
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
 
-
-
-
-
-
-
+
 
-
-
-
-
-
-
+
+
+
 
-
-
+
+
+
+
 
 
-
-
-
-
+
 
+
+
+
+
+
+
+
 
 
 
@@ -1229,53 +1231,53 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
 
-
-
-
-
-
+
 
-
-
-
-
 
+
+
 
 
-
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
 
+
+
 
 
-
+
+
+
 
 
-
+
+
+
+
+
+
+
 
 
 
@@ -1302,25 +1304,25 @@
 
 
 
-
-
+
 
 
 
 
 
 
-
-
+
 
-
 
-
-
-
+
+
+
+
+
 
 
-
+
+
 
 
 
@@ -1333,33 +1335,33 @@
 
 
 
-
-
+
 
 
 
 
-
-
 
-
+
 
-
 
+
+
+
+
+
+
+
+
+
 
-
-
-
-
 
-
+
+
 
+
 
-
-
-
-
 
+
 
 
 
@@ -1371,6 +1373,14 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1381,52 +1391,44 @@
 
 
 
-
+
 
-
-
-
-
-
-
-
-
-
-
-
+
+
 
 
-
-
-
 
 
+
+
+
 
 
-
-
 
 
-
-
-
-
-
-
-
+
+
 
 
-
+
+
+
 
 
-
 
-
-
-
+
+
+
+
+
+
+
+
 
-
+
 
+
 
-
 
+
+
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index b7ff71ec..91e04c2d 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -3,12 +3,12 @@
 
 
 nm-utils
-
+
 
 
 
 
-
+
 
 
 
@@ -42,77 +42,77 @@
 
 #include <nm-utils.h>
 
-enum                NMUtilsSecurityType;
-#define             NM_UTILS_HWADDR_LEN_MAX
-gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);
+gboolean            nm_utils_init                       (GError **error);
 void                nm_utils_deinit                     (void);
+gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
-gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);
+char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
-GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);
-guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);
-int                 nm_utils_hwaddr_len                 (int type);
-char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);
-int                 nm_utils_hwaddr_type                (int len);
-gboolean            nm_utils_iface_valid_name           (const char *name);
-gboolean            nm_utils_init                       (GError **error);
+void                nm_utils_slist_free                 (GSList *list,
+                                                         GDestroyNotify elem_destroy_fn);
+enum                NMUtilsSecurityType;
+gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);
+gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);
+gboolean            nm_utils_wep_key_valid              (const char *key,
+                                                         NMWepKeyType wep_type);
+gboolean            nm_utils_wpa_psk_valid              (const char *psk);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
-guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
-guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
-guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
 GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);
 void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
                                                          GValue *value);
+guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
+guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
+guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
 GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
-GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
-void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
-                                                         GValue *value);
 GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);
 void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
                                                          GValue *value);
-gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);
-gboolean            nm_utils_is_uuid                    (const char *str);
+GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
+void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+                                                         GValue *value);
+char *              nm_utils_uuid_generate              (void);
+char *              nm_utils_uuid_generate_from_string  (const char *s);
 GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
                                                          char **out_password,
                                                          GError **error);
-gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);
-void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);
-char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
-char *              nm_utils_uuid_generate              (void);
-char *              nm_utils_uuid_generate_from_string  (const char *s);
-gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);
+gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
 guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
                                                          const char *band);
 guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
                                                          int direction,
                                                          char *band);
-guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
 gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);
-gboolean            nm_utils_wpa_psk_valid              (const char *psk);
+#define             NM_UTILS_HWADDR_LEN_MAX
+int                 nm_utils_hwaddr_len                 (int type);
+int                 nm_utils_hwaddr_type                (int len);
+char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);
+GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);
+guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);
+gboolean            nm_utils_iface_valid_name           (const char *name);
+gboolean            nm_utils_is_uuid                    (const char *str);
 

 

 

@@ -132,132 +132,74 @@ access points and devices, among other things.
 

 
Details

 

-
enum NMUtilsSecurityType

-
typedef enum {
-	NMU_SEC_INVALID = 0,
-	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
-} NMUtilsSecurityType;
-

+
nm_utils_init ()

+
gboolean            nm_utils_init                       (GError **error);

 

-Describes generic security mechanisms that 802.11 access points may offer.
-Used with nm_utils_security_valid() for checking whether a given access
-point is compatible with a network device.
+Initializes libnm-util; should be called when starting and program that
+uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
+is performed, but calling nm_utils_deinit() to explicitly deinitialize
+libnm-util can also be done.  This function can be called more than once.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+

 


 
 
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
-
NMU_SEC_NONE
unencrypted and open
-
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
-
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
-dynamic WEP keys automatically
-
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
-generating the dynamic WEP keys automatically
-
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
-
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
-
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
+
error :
location to store error, or NULL
 
 

 
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
-
Returns :
TRUE if the initialization was successful, FALSE on failure.
 

 
 

 

 

 

-
NM_UTILS_HWADDR_LEN_MAX

-
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
-

+
nm_utils_deinit ()

+
void                nm_utils_deinit                     (void);

 

-The maximum length of a hardware address of a type known by
-nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
-as the size of the buffer passed to nm_utils_hwaddr_aton().
+Frees all resources used internally by libnm-util.  This function is called
+from an atexit() handler, set up by nm_utils_init(), but is safe to be called
+more than once.  Subsequent calls have no effect until nm_utils_init() is
+called again.
 

 

 

 

-
nm_utils_ap_mode_security_valid ()

-
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);

+
nm_utils_is_empty_ssid ()

+
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);

 

-Given a set of device capabilities, and a desired security type to check
-against, determines whether the combination of device capabilities and
-desired security type are valid for AP/Hotspot connections.
+Different manufacturers use different mechanisms for not broadcasting the
+AP's SSID.  This function attempts to detect blank/empty SSIDs using a
+number of known SSID-cloaking methods.
 

-

+

+++
-
-
+
+
-
-
+
-
+

 


 
 
type :
the security type to check device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
ssid :
pointer to a buffer containing the SSID data
 

 
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
len :
length of the SSID data in ssid
 
 

 

 
Returns :
TRUE if the device capabilities are compatible with the desired
-type, FALSE if they are not.TRUE if the SSID is "empty", FALSE if it is not
 

 
 

-
Since 0.9.8

-

-

-

-
nm_utils_deinit ()

-
void                nm_utils_deinit                     (void);

-

-Frees all resources used internally by libnm-util.  This function is called
-from an atexit() handler, set up by nm_utils_init(), but is safe to be called
-more than once.  Subsequent calls have no effect until nm_utils_init() is
-called again.
-

 

 

 

@@ -270,8 +212,11 @@ replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
 be used for display of SSIDs.
 

-

+

+++
@@ -292,73 +237,89 @@ and will be overwritten by subsequent calls to this function

-
nm_utils_file_is_pkcs12 ()

-
gboolean            nm_utils_file_is_pkcs12             (const char *filename);

+
nm_utils_same_ssid ()

+
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);

 

-Utility function to find out if the filename is in PKCS12 format.
+Earlier versions of the Linux kernel added a NULL byte to the end of the
+SSID to enable easy printing of the SSID on the console or in a terminal,
+but this behavior was problematic (SSIDs are simply byte arrays, not strings)
+and thus was changed.  This function compensates for that behavior at the
+cost of some compatibility with odd SSIDs that may legitimately have trailing
+NULLs, even though that is functionally pointless.
 

-

 


 
 

 
ssid :

 
 
 

+

+++
-
-
+
+
-
-
+
+
-
-

 


 
 
filename :
name of the file to test
ssid1 :
first SSID data to compare
 

 
Returns :
TRUE if the file is PKCS12, FALSE if it is not
ssid2 :
second SSID data to compare
 

-

-

-

-
nm_utils_gvalue_hash_dup ()

-
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

-

-Utility function to duplicate a hash table of GValues.
-

-

--
-
-
+
+
-
+


 
hash :
a GHashTable mapping string:GValue
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
 

 

 
Returns :
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]
-TRUE if the SSIDs are the same, FALSE if they are not
 

 
 

 

 

 

-
nm_utils_hwaddr_atoba ()

-
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);

+
nm_utils_ssid_to_utf8 ()

+
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

 

-Parses asc and converts it to binary form in a GByteArray. See
-nm_utils_hwaddr_aton() if you don't want a GByteArray.
-

-

--
-
-
-
-
+WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
+contain embedded NULLs and other unprintable characters.  Often it is
+useful to print the SSID out for debugging purposes, but that should be the
+_only_ use of this function.  Do not use this function for any persistent
+storage of the SSID, since the printable SSID returned from this function
+cannot be converted back into the real SSID of the access point.
+

+

+This function does almost everything humanly possible to convert the input
+into a printable UTF-8 string, using roughly the following procedure:
+

+

+1) if the input data is already UTF-8 safe, no conversion is performed
+2) attempts to get the current system language from the LANG environment
+   variable, and depending on the language, uses a table of alternative
+   encodings to try.  For example, if LANG=hu_HU, the table may first try
+   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
+   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
+3) If the system language was unable to be determined, falls back to the
+   ISO-8859-1 encoding, then to the Windows-1251 encoding.
+4) If step 3 fails, replaces non-UTF-8 characters with '?'.
+

+

+Again, this function should be used for debugging and display purposes
+_only_.
+

+


asc :
the ASCII representation of a hardware address

++++
+
-
-
+
+
-
@@ -366,131 +327,264 @@ be parsed. [
-
nm_utils_hwaddr_aton ()

-
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);

+
nm_utils_gvalue_hash_dup ()

+
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

 

-Parses asc and converts it to binary form in buffer. See
-nm_utils_hwaddr_atoba() if you'd rather have the result in a
-GByteArray.
+Utility function to duplicate a hash table of GValues.
 

-




 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
-
ssid :
a byte array containing the SSID data
 

 

 
Returns :
a new GByteArray, or NULL if asc couldn't
-be parsed. [transfer full]
+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]
 
 

 

+

+++
-
-
+
+
-
-
+
+
+

 


 
 
asc :
the ASCII representation of a hardware address
hash :
a GHashTable mapping string:GValue
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
Returns :
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);

+

+Utility function to free a GSList.
+

+

++++
+
-
-
+
+
-
-
+
+




 
buffer :
buffer to store the result into
list :
a GSList
+
 

 
Returns :

-buffer, or NULL if asc couldn't be parsed
elem_destroy_fn :
user function called for each element in list
+
 

 
 

 

 

 

-
nm_utils_hwaddr_len ()

-
int                 nm_utils_hwaddr_len                 (int type);

+
enum NMUtilsSecurityType

+
typedef enum {
+	NMU_SEC_INVALID = 0,
+	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
+} NMUtilsSecurityType;
+

 

-Returns the length in octets of a hardware address of type type.
+Describes generic security mechanisms that 802.11 access points may offer.
+Used with nm_utils_security_valid() for checking whether a given access
+point is compatible with a network device.
 

-

+

+++
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
 
 

 
Returns :
the length
NMU_SEC_NONE
unencrypted and open
+
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
+
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
+dynamic WEP keys automatically
+
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
+generating the dynamic WEP keys automatically
+
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
+
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
+
 

 
 

 

 

 

-
nm_utils_hwaddr_ntoa ()

-
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);

+
nm_utils_security_valid ()

+
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);

 

-Converts addr to textual form.
+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device, desired security
+type, and AP capabilities intersect.
+

+

+NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use nm_utils_ap_mode_security_valid() instead.
 

-

+

+++
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 
addr :
a binary hardware address
type :
the security type to check AP flags and device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
 
 

 
Returns :
the textual form of addr. [transfer full]
+
have_ap :
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)
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
 
 
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)
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)
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type, FALSE if they are not

 
 

 

 

 

-
nm_utils_hwaddr_type ()

-
int                 nm_utils_hwaddr_type                (int len);

+
nm_utils_ap_mode_security_valid ()

+
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);

 

-Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
-address given its length.
+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device capabilities and
+desired security type are valid for AP/Hotspot connections.
 

-

+

+++
-
-
+
+
+
+
+
+
-
+

 


 
 
len :
the length of hardware address in bytes
type :
the security type to check device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
 

 

 
Returns :
the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
-the address length was not recognizedTRUE if the device capabilities are compatible with the desired
+type, FALSE if they are not.
 

 
 

+
Since 0.9.8

 

 

 

-
nm_utils_iface_valid_name ()

-
gboolean            nm_utils_iface_valid_name           (const char *name);

+
nm_utils_wep_key_valid ()

+
gboolean            nm_utils_wep_key_valid              (const char *key,
+                                                         NMWepKeyType wep_type);

 

-This function is a 1:1 copy of the kernel's interface validation
-function in net/core/dev.c.
+Checks if key is a valid WEP key
 

-

+

+++
-
-
+
+
+
+
+
+
+TRUE if key is a WEP key, FALSE if not

 


 
 
name :
Name of interface
key :
a string that might be a WEP key
wep_type :
the NMWepKeyType type of the WEP key
 

 

 
Returns :

 
-TRUE if interface name is valid, otherwise FALSE is returned.
 

 
 

@@ -498,28 +592,29 @@ function in net/core/dev.c.
 

 

 

-
nm_utils_init ()

-
gboolean            nm_utils_init                       (GError **error);

+
nm_utils_wpa_psk_valid ()

+
gboolean            nm_utils_wpa_psk_valid              (const char *psk);

 

-Initializes libnm-util; should be called when starting and program that
-uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
-is performed, but calling nm_utils_deinit() to explicitly deinitialize
-libnm-util can also be done.  This function can be called more than once.
+Checks if psk is a valid WPA PSK
 

-

+

+++
-
-
+
+
-
+

 


 
 
error :
location to store error, or NULL
-
psk :
a string that might be a WPA PSK
 

 

 
Returns :
TRUE if the initialization was successful, FALSE on failure.
+TRUE if psk is a WPA PSK, FALSE if not
 

 
 

+
Since 0.9.8

 

 

 

@@ -532,8 +627,11 @@ and prefix) into a GSList of GArray may be
 extended in the future.
 

-

+

+++
@@ -555,83 +653,26 @@ extended in the future.
 

 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
-extended in the future.
-

-

 


 
 

 
value :

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


list :
a list of NMIP4Address objects. [element-type NMIP4Address]
-
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().

-

-

-

-
nm_utils_ip4_get_default_prefix ()

-
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

-

-When the Internet was originally set up, various ranges of IP addresses were
-segmented into three network classes: A, B, and C.  This function will return
-a prefix that is associated with the IP address specified defining where it
-falls in the predefined classes.
-

-

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


ip :
an IPv4 address (in network byte order)
Returns :
the default class prefix for the given IP

-

-

-

-
nm_utils_ip4_netmask_to_prefix ()

-
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

-

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


netmask :
an IPv4 netmask in network byte order
Returns :
the CIDR prefix represented by the netmask

-

-

-

-
nm_utils_ip4_prefix_to_netmask ()

-
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

-

+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
+extended in the future.
+

+

+++
-
-
+
+
-
-
+
+

 


 
 
prefix :
a CIDR prefix
list :
a list of NMIP4Address objects. [element-type NMIP4Address]
+
 

 
Returns :
the netmask represented by the prefix, in network byte order
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().
 

 
 

@@ -647,8 +688,11 @@ prefix, and metric) into a GSList of 
+

+++
@@ -674,8 +718,11 @@ 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
 be extended in the future.
 

-

 


 
 

 
value :

+

+++
@@ -693,79 +740,97 @@ which should be unset by the caller (when no longer needed) with
 

-
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
-this serialization is not guaranteed to be stable and the GValueArray may be
-extended in the future.
-

-

 


 
 

 
list :

 
 

+
nm_utils_ip4_netmask_to_prefix ()

+
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

+

+++
-
-
+
+
-
+

 


 
 
value :
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
netmask :
an IPv4 netmask in network byte order
 

 

 
Returns :
a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
-the CIDR prefix represented by the netmask
 

 
 

 

 

 

-
nm_utils_ip6_addresses_to_gvalue ()

-
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);

+
nm_utils_ip4_prefix_to_netmask ()

+
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

+

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




prefix :
a CIDR prefix
Returns :
the netmask represented by the prefix, in network byte order

+

+

+

+
nm_utils_ip4_get_default_prefix ()

+
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

 

-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
-future.
+When the Internet was originally set up, various ranges of IP addresses were
+segmented into three network classes: A, B, and C.  This function will return
+a prefix that is associated with the IP address specified defining where it
+falls in the predefined classes.
 

-

+

+++
-
-
+
+
-
-
+
+

 


 
 
list :
a list of NMIP6Address objects. [element-type NMIP6Address]
-
ip :
an IPv4 address (in network byte order)
 

 
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().
Returns :
the default class prefix for the given IP
 

 
 

 

 

 

-
nm_utils_ip6_dns_from_gvalue ()

-
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

+
nm_utils_ip6_addresses_from_gvalue ()

+
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

 

-Converts a GValue containing a GPtrArray of IP6 DNS, represented as
-GByteArrays into a GSList of in6_addrs.
+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
+this serialization is not guaranteed to be stable and the GValueArray may be
+extended in the future.
 

-

+

+++
-
+
-
@@ -773,26 +838,31 @@ addresses. [
-
nm_utils_ip6_dns_to_gvalue ()

-
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+
nm_utils_ip6_addresses_to_gvalue ()

+
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of 'struct in6_addr' structs into a
-GPtrArray of GByteArrays representing each server's IPv6 addresses in
-network byte order.  The specific format of this serialization is not
-guaranteed to be stable and may be extended in the future.
+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
+future.
 

-

 


 
 

 
value :
a GValue
-gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 

 

 
Returns :
a GSList of IP6
-addresses. [transfer full][element-type Posix.in6_addr]
+a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
 
 

 

+

+++
-
+
-
@@ -809,8 +879,11 @@ routes (which is a tuple of destination, prefix, next hop, and metric)
 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.
 

-

 


 
 

 
list :
a list of NMIP6Route objectsa list of NMIP6Address objects. [element-type NMIP6Address]
+
 

 

 
value :
a pointer to a GValue into which to place the converted DNS server
-addresses, which should be unset by the caller (when no longer needed) with
+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().
 

 

+

+++
@@ -837,8 +910,11 @@ representing a list of NetworkManager IPv6 routes (which is a tuple of destinati
 prefix, next hop, and metric).  The specific format of this serialization is not 
 guaranteed to be stable and may be extended in the future.
 

-

 


 
 

 
value :

+

+++
@@ -856,55 +932,103 @@ which should be unset by the caller (when no longer needed) with
 

-
nm_utils_is_empty_ssid ()

-
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);

+
nm_utils_ip6_dns_from_gvalue ()

+
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

 

-Different manufacturers use different mechanisms for not broadcasting the
-AP's SSID.  This function attempts to detect blank/empty SSIDs using a
-number of known SSID-cloaking methods.
+Converts a GValue containing a GPtrArray of IP6 DNS, represented as
+GByteArrays into a GSList of in6_addrs.
 

-

 


 
 

 
list :

 
 

+

+++
-
-
+
+
-
-
+
+
+

 


 
 
ssid :
pointer to a buffer containing the SSID data
value :
a GValue
+
 

 
len :
length of the SSID data in ssid
+
Returns :
a GSList of IP6
+addresses. [transfer full][element-type Posix.in6_addr]
 
 

+

+

+

+
nm_utils_ip6_dns_to_gvalue ()

+
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+                                                         GValue *value);

+

+Utility function to convert a GSList of 'struct in6_addr' structs into a
+GPtrArray of GByteArrays representing each server's IPv6 addresses in
+network byte order.  The specific format of this serialization is not
+guaranteed to be stable and may be extended in the future.
+

+

++++
+
+
+
+
+
-
-
+
+




list :
a list of NMIP6Route objects

 
Returns :
TRUE if the SSID is "empty", FALSE if it is not
value :
a pointer to a GValue into which to place the converted DNS server
+addresses, which should be unset by the caller (when no longer needed) with
+g_value_unset().
 

 
 

 

 

 

-
nm_utils_is_uuid ()

-
gboolean            nm_utils_is_uuid                    (const char *str);

+
nm_utils_uuid_generate ()

+
char *              nm_utils_uuid_generate              (void);

+

++++
+
+
+
+
+




Returns :
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);

 

-Checks if str is a UUID
+For a given s, this function will always return the same UUID.
 

-

+

+++
-
-
+
+
-
+

 


 
 
str :
a string that might be a UUID
s :
a string to use as the seed for the UUID
 

 

 
Returns :

-TRUE if str is a UUID, FALSE if nota newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property
 

 
 

-
Since 0.9.8

 

 

 

@@ -918,8 +1042,11 @@ Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file.
 

-

+

+++
@@ -932,7 +1059,7 @@ suitable for writing to a file.
 
-
@@ -951,365 +1078,358 @@ certificate/private key file. [
-
nm_utils_same_ssid ()

-
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);

+
nm_utils_file_is_pkcs12 ()

+
gboolean            nm_utils_file_is_pkcs12             (const char *filename);

 

-Earlier versions of the Linux kernel added a NULL byte to the end of the
-SSID to enable easy printing of the SSID on the console or in a terminal,
-but this behavior was problematic (SSIDs are simply byte arrays, not strings)
-and thus was changed.  This function compensates for that behavior at the
-cost of some compatibility with odd SSIDs that may legitimately have trailing
-NULLs, even though that is functionally pointless.
+Utility function to find out if the filename is in PKCS12 format.
 

-

 


 
 

 
data :

 

 
out_password :
if in_password was NULL, a random password will be generated
+if in_password was NULL, a random password will be generated
 and returned in this argument. [out][allow-none]
 
 

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
+

 


 
 
ssid1 :
first SSID data to compare
ssid2 :
second SSID data to compare
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
filename :
name of the file to test
 

 

 
Returns :
TRUE if the SSIDs are the same, FALSE if they are notTRUE if the file is PKCS12, FALSE if it is not
 

 
 

 

 

 

-
nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);

-

-Given a set of device capabilities, and a desired security type to check
-against, determines whether the combination of device, desired security
-type, and AP capabilities intersect.
-

+
nm_utils_wifi_freq_to_channel ()

+
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

 

-NOTE: this function cannot handle checking security for AP/Hotspot mode;
-use nm_utils_ap_mode_security_valid() instead.
+Utility function to translate a WiFi frequency to its corresponding channel.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+

 


 
 
type :
the security type to check AP flags and device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
-
have_ap :
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)
freq :
frequency
 

 
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
-
Returns :
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);

+

+Utility function to translate a WiFi channel to its corresponding frequency.
+

+

++++
+
-
-
+
+
-
-
+
+
-
+




 
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)
channel :
channel
 

 
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)
band :
frequency band for wireless ("a" or "bg")
 

 

 
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are notthe frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid
 

 
 

 

 

 

-
nm_utils_slist_free ()

-
void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);

+
nm_utils_wifi_find_next_channel ()

+
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
+                                                         int direction,
+                                                         char *band);

 

-Utility function to free a GSList.
+Utility function to find out next/previous WiFi channel for a channel.
 

-

+

+++
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 


 
 
list :
a GSList
-
channel :
current channel
 

 
elem_destroy_fn :
user function called for each element in list
-
direction :
whether going downward (0 or less) or upward (1 or more)
band :
frequency band for wireless ("a" or "bg")
Returns :
the next channel in the specified direction or 0
 

 
 

 

 

 

-
nm_utils_ssid_to_utf8 ()

-
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
-useful to print the SSID out for debugging purposes, but that should be the
-_only_ use of this function.  Do not use this function for any persistent
-storage of the SSID, since the printable SSID returned from this function
-cannot be converted back into the real SSID of the access point.
-

-

-This function does almost everything humanly possible to convert the input
-into a printable UTF-8 string, using roughly the following procedure:
-

-

-1) if the input data is already UTF-8 safe, no conversion is performed
-2) attempts to get the current system language from the LANG environment
-   variable, and depending on the language, uses a table of alternative
-   encodings to try.  For example, if LANG=hu_HU, the table may first try
-   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
-   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
-3) If the system language was unable to be determined, falls back to the
-   ISO-8859-1 encoding, then to the Windows-1251 encoding.
-4) If step 3 fails, replaces non-UTF-8 characters with '?'.
-

+
nm_utils_wifi_is_channel_valid ()

+
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
+                                                         const char *band);

 

-Again, this function should be used for debugging and display purposes
-_only_.
+Utility function to verify WiFi channel validity.
 

-

+

+++
-
-
+
+
+
+
+
+
-
+

 


 
 
ssid :
a byte array containing the SSID data
channel :
channel
band :
frequency band for wireless ("a" or "bg")
 

 

 
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. [transfer full]
-TRUE or FALSE
 

 
 

 

 

 

-
nm_utils_uuid_generate ()

-
char *              nm_utils_uuid_generate              (void);

-

--
-
-
-
-


Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property.  Should be freed with g_free()
-

+
NM_UTILS_HWADDR_LEN_MAX

+
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
+

+

+The maximum length of a hardware address of a type known by
+nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
+as the size of the buffer passed to nm_utils_hwaddr_aton().
+

 

 

 

-
nm_utils_uuid_generate_from_string ()

-
char *              nm_utils_uuid_generate_from_string  (const char *s);

+
nm_utils_hwaddr_len ()

+
int                 nm_utils_hwaddr_len                 (int type);

 

-For a given s, this function will always return the same UUID.
+Returns the length in octets of a hardware address of type type.
 

-

+

+++
-
-
+
+
-
+

 


 
 
s :
a string to use as the seed for the UUID
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": propertythe length
 

 
 

 

 

 

-
nm_utils_wep_key_valid ()

-
gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);

+
nm_utils_hwaddr_type ()

+
int                 nm_utils_hwaddr_type                (int len);

 

-Checks if key is a valid WEP key
+Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
+address given its length.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
key :
a string that might be a WEP key
wep_type :
the NMWepKeyType type of the WEP key
len :
the length of hardware address in bytes
 

 

 
Returns :

-TRUE if key is a WEP key, FALSE if notthe type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
+the address length was not recognized
 

 
 

-
Since 0.9.8

 

 

 

-
nm_utils_wifi_channel_to_freq ()

-
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
-                                                         const char *band);

+
nm_utils_hwaddr_ntoa ()

+
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);

 

-Utility function to translate a WiFi channel to its corresponding frequency.
+Converts addr to textual form.
 

-

+

+++
-
-
+
+
-
-
+
+
-
+

 


 
 
channel :
channel
addr :
a binary hardware address
 

 
band :
frequency band for wireless ("a" or "bg")
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
the frequency represented by the channel of the band,
-or -1 when the freq is invalid, or 0 when the band
-is invalidthe textual form of addr. [transfer full]
+
 

 
 

 

 

 

-
nm_utils_wifi_find_next_channel ()

-
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
-                                                         int direction,
-                                                         char *band);

+
nm_utils_hwaddr_atoba ()

+
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);

 

-Utility function to find out next/previous WiFi channel for a channel.
+Parses asc and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.
 

-

+

+++
-
-
-
-
-
-
+
+
-
-
+
+
-
+

 


 
 
channel :
current channel
direction :
whether going downward (0 or less) or upward (1 or more)
asc :
the ASCII representation of a hardware address
 

 
band :
frequency band for wireless ("a" or "bg")
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
the next channel in the specified direction or 0a new GByteArray, or NULL if asc couldn't
+be parsed. [transfer full]
+
 

 
 

 

 

 

-
nm_utils_wifi_freq_to_channel ()

-
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

+
nm_utils_hwaddr_aton ()

+
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);

 

-Utility function to translate a WiFi frequency to its corresponding channel.
+Parses asc and converts it to binary form in buffer. See
+nm_utils_hwaddr_atoba() if you'd rather have the result in a
+GByteArray.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 
freq :
frequency
asc :
the ASCII representation of a hardware address
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
buffer :
buffer to store the result into
 

 

 
Returns :
the channel represented by the frequency or 0
+buffer, or NULL if asc couldn't be parsed
 

 
 

 

 

 

-
nm_utils_wifi_is_channel_valid ()

-
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
-                                                         const char *band);

+
nm_utils_iface_valid_name ()

+
gboolean            nm_utils_iface_valid_name           (const char *name);

 

-Utility function to verify WiFi channel validity.
+This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
channel :
channel
band :
frequency band for wireless ("a" or "bg")
name :
Name of interface
 

 

 
Returns :
TRUE or FALSE
+TRUE if interface name is valid, otherwise FALSE is returned.
 

 
 

+
Since 0.9.8

 

 

 

-
nm_utils_wpa_psk_valid ()

-
gboolean            nm_utils_wpa_psk_valid              (const char *psk);

+
nm_utils_is_uuid ()

+
gboolean            nm_utils_is_uuid                    (const char *str);

 

-Checks if psk is a valid WPA PSK
+Checks if str is a UUID
 

-

+

+++
-
-
+
+
+TRUE if str is a UUID, FALSE if not

 


 
 
psk :
a string that might be a WPA PSK
str :
a string that might be a UUID
 

 

 
Returns :

 
-TRUE if psk is a WPA PSK, FALSE if not
 

 
 

@@ -1319,6 +1439,6 @@ Checks if psk is a valid WPA PSK
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 9f00e53a..f1daa3d4 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -34,31 +34,44 @@
     
   
   
-    
-    
     
     
+    
     
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
-    
     
-    
     
     
     
     
-    
     
     
     
@@ -69,98 +82,85 @@
     
     
     
-    
     
     
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
     
     
-    
-    
-    
-    
-    
     
-    
-    
-    
     
-    
-    
+    
+    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
+    
+    
+    
     
-    
+    
+    
+    
     
-    
-    
+    
     
-    
     
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
-    
-    
-    
     
-    
-    
     
+    
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -173,38 +173,38 @@
     
     
     
-    
-    
+    
     
-    
-    
-    
     
+    
+    
+    
+    
+    
     
+    
     
     
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
     
+    
     
     
-    
-    
+    
     
+    
     
     
-    
-    
-    
+    
     
     
     
@@ -217,47 +217,47 @@
     
     
     
-    
-    
+    
     
+    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
     
+    
     
-    
+    
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
-    
-    
     
+    
+    
+    
     
-    
-    
-    
+    
     
     
     
@@ -272,58 +272,58 @@
     
     
     
-    
-    
+    
     
+    
+    
     
+    
+    
     
-    
+    
+    
     
-    
-    
-    
     
-    
-    
-    
-    
-    
     
     
     
     
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
     
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
     
     
     
@@ -341,93 +341,93 @@
     
     
     
-    
-    
+    
     
-    
     
-    
+    
+    
     
     
     
-    
+    
+    
+    
     
     
-    
     
     
-    
-    
+    
     
+    
+    
     
     
-    
     
-    
-    
     
-    
+    
+    
+    
+    
     
     
     
-    
     
-    
+    
     
     
     
     
     
-    
-    
+    
     
     
+    
     
+    
     
     
-    
-    
-    
+    
+    
+    
     
+    
     
     
-    
-    
     
     
     
     
-    
-    
+    
     
-    
-    
-    
-    
     
-    
-    
-    
+    
     
+    
     
     
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
     
-    
-    
-    
+    
     
+    
     
-    
-    
+    
     
     
     
@@ -439,65 +439,65 @@
     
     
     
-    
-    
+    
     
     
-    
-    
-    
     
-    
-    
+    
+    
+    
+    
     
+    
+    
     
     
-    
-    
+    
     
     
+    
     
     
-    
-    
-    
-    
     
+    
+    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
+    
     
+    
+    
     
     
-    
-    
+    
     
-    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
+    
     
     
     
@@ -505,111 +505,111 @@
     
     
     
-    
-    
+    
     
     
-    
-    
-    
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
-    
-    
+    
     
     
+    
     
     
-    
     
-    
+    
+    
+    
     
     
     
-    
     
     
     
-    
-    
+    
     
-    
-    
-    
     
-    
-    
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
+    
+    
+    
     
-    
+    
     
+    
+    
     
     
     
     
     
     
-    
-    
+    
     
-    
-    
     
-    
-    
     
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
     
     
     
-    
-    
+    
     
-    
-    
-    
     
+    
+    
     
     
     
-    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
     
-    
+    
+    
     
     
     
@@ -617,111 +617,111 @@
     
     
     
-    
     
     
-    
+    
     
-    
+    
+    
+    
+    
     
+    
     
     
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
+    
+    
     
     
     
     
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
-    
     
     
-    
-    
-    
-    
-    
     
-    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
-    
+    
+    
     
     
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
     
+    
     
-    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
+    
+    
+    
     
     
     
@@ -747,89 +747,91 @@
     
     
     
+    
+    
     
     
     
     
     
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
+    
+    
+    
     
     
-    
-    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
+    
+    
+    
     
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
+    
+    
+    
     
-    
-    
+    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -842,84 +844,84 @@
     
     
     
-    
-    
-    
-    
+    
     
-    
-    
-    
+    
+    
+    
     
     
-    
-    
+    
+    
     
-    
+    
+    
     
-    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
+    
+    
+    
     
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
+    
+    
+    
     
-    
-    
+    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -931,49 +933,49 @@
     
     
     
-    
-    
+    
     
-    
-    
     
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
     
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
     
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -992,119 +994,119 @@
     
     
     
-    
-    
+    
     
     
-    
-    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
     
-    
+    
+    
     
     
     
     
-    
-    
+    
     
-    
-    
     
-    
+    
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
     
-    
+    
+    
     
+    
     
-    
-    
-    
-    
     
+    
     
     
     
     
-    
-    
-    
+    
     
+    
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
     
     
+    
+    
+    
     
     
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
-    
-    
-    
-    
+    
+    
+    
     
     
     
@@ -1145,6 +1147,13 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1160,13 +1169,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -1188,11 +1190,11 @@
     
     
     
+    
+    
     
     
     
-    
-    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index e6ea328c..df07ca9f 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -3,12 +3,12 @@
 
 
 Object Hierarchy
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-Object Hierarchy

+

+Object Hierarchy

 
     GObject
         NMSetting
@@ -95,6 +95,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index ad93832e..e70e2682 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1,31 +1,44 @@
 

 nm-connection
 NMConnection
-NMConnection
-NMConnectionClass
 NMConnectionError
 NM_CONNECTION_ERROR
+nm_connection_error_quark
 NM_CONNECTION_PATH
+NMConnection
+NMConnectionClass
+nm_connection_new
+nm_connection_new_from_hash
+nm_connection_duplicate
+nm_connection_create_setting
 nm_connection_add_setting
-nm_connection_clear_secrets
-nm_connection_clear_secrets_with_flags
+nm_connection_remove_setting
+nm_connection_get_setting
+nm_connection_get_setting_by_name
+nm_connection_replace_settings
 nm_connection_compare
-nm_connection_create_setting
 nm_connection_diff
-nm_connection_dump
-nm_connection_duplicate
-nm_connection_error_quark
+nm_connection_verify
+nm_connection_need_secrets
+nm_connection_clear_secrets
+nm_connection_clear_secrets_with_flags
+nm_connection_update_secrets
+nm_connection_set_path
+nm_connection_get_path
+nm_connection_get_virtual_iface_name
+nm_connection_is_type
 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_path
-nm_connection_get_setting
 nm_connection_get_setting_802_1x
-nm_connection_get_setting_adsl
 nm_connection_get_setting_bluetooth
 nm_connection_get_setting_bond
 nm_connection_get_setting_bridge
 nm_connection_get_setting_bridge_port
-nm_connection_get_setting_by_name
 nm_connection_get_setting_cdma
 nm_connection_get_setting_connection
 nm_connection_get_setting_gsm
@@ -36,26 +49,13 @@ nm_connection_get_setting_olpc_mesh
 nm_connection_get_setting_ppp
 nm_connection_get_setting_pppoe
 nm_connection_get_setting_serial
-nm_connection_get_setting_vlan
 nm_connection_get_setting_vpn
 nm_connection_get_setting_wimax
+nm_connection_get_setting_adsl
 nm_connection_get_setting_wired
 nm_connection_get_setting_wireless
 nm_connection_get_setting_wireless_security
-nm_connection_get_uuid
-nm_connection_get_virtual_iface_name
-nm_connection_is_type
-nm_connection_lookup_setting_type
-nm_connection_lookup_setting_type_by_quark
-nm_connection_need_secrets
-nm_connection_new
-nm_connection_new_from_hash
-nm_connection_remove_setting
-nm_connection_replace_settings
-nm_connection_set_path
-nm_connection_to_hash
-nm_connection_update_secrets
-nm_connection_verify
+nm_connection_get_setting_vlan
 
 NM_CONNECTION
 NM_CONNECTION_CLASS
@@ -69,38 +69,38 @@ nm_connection_get_type
 

 nm-setting
 NMSetting
-NMSetting
-NMSettingClass
-NMSettingClearSecretsWithFlagsFn
-NMSettingCompareFlags
-NMSettingDiffResult
 NMSettingError
-NMSettingHashFlags
-NMSettingSecretFlags
-NMSettingValueIterFn
 NM_SETTING_ERROR
-NM_SETTING_NAME
-NM_SETTING_PARAM_FUZZY_IGNORE
+nm_setting_error_quark
+NM_SETTING_PARAM_SERIALIZE
 NM_SETTING_PARAM_REQUIRED
 NM_SETTING_PARAM_SECRET
-NM_SETTING_PARAM_SERIALIZE
-nm_setting_clear_secrets
-nm_setting_clear_secrets_with_flags
+NM_SETTING_PARAM_FUZZY_IGNORE
+NM_SETTING_NAME
+NMSettingSecretFlags
+NMSettingCompareFlags
+NMSetting
+NMSettingClearSecretsWithFlagsFn
+NMSettingClass
+NMSettingValueIterFn
+NMSettingHashFlags
+nm_setting_to_hash
+nm_setting_new_from_hash
+nm_setting_duplicate
+nm_setting_get_name
+nm_setting_verify
 nm_setting_compare
+NMSettingDiffResult
 nm_setting_diff
-nm_setting_duplicate
 nm_setting_enumerate_values
-nm_setting_error_quark
-nm_setting_get_name
-nm_setting_get_secret_flags
-nm_setting_get_virtual_iface_name
-nm_setting_need_secrets
-nm_setting_new_from_hash
-nm_setting_set_secret_flags
-nm_setting_to_hash
 nm_setting_to_string
+nm_setting_clear_secrets
+nm_setting_clear_secrets_with_flags
+nm_setting_need_secrets
 nm_setting_update_secrets
-nm_setting_verify
+nm_setting_get_secret_flags
+nm_setting_set_secret_flags
+nm_setting_get_virtual_iface_name
 
 NM_IS_SETTING
 NM_IS_SETTING_CLASS
@@ -114,111 +114,111 @@ nm_setting_get_type
 

 nm-setting-8021x
 NMSetting8021x
-NMSetting8021x
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
-NMSetting8021xClass
+NM_SETTING_802_1X_SETTING_NAME
 NMSetting8021xError
-NM_SETTING_802_1X_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_ERROR
+nm_setting_802_1x_error_quark
+NM_SETTING_802_1X_EAP
+NM_SETTING_802_1X_IDENTITY
 NM_SETTING_802_1X_ANONYMOUS_IDENTITY
+NM_SETTING_802_1X_PAC_FILE
 NM_SETTING_802_1X_CA_CERT
 NM_SETTING_802_1X_CA_PATH
+NM_SETTING_802_1X_SUBJECT_MATCH
+NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_CLIENT_CERT
-NM_SETTING_802_1X_EAP
-NM_SETTING_802_1X_ERROR
-NM_SETTING_802_1X_IDENTITY
-NM_SETTING_802_1X_PAC_FILE
-NM_SETTING_802_1X_PASSWORD
-NM_SETTING_802_1X_PASSWORD_FLAGS
-NM_SETTING_802_1X_PASSWORD_RAW
-NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
-NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
-NM_SETTING_802_1X_PHASE1_PEAPLABEL
 NM_SETTING_802_1X_PHASE1_PEAPVER
-NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_PHASE1_PEAPLABEL
+NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 NM_SETTING_802_1X_PHASE2_AUTH
 NM_SETTING_802_1X_PHASE2_AUTHEAP
 NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
+NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
+NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
+NM_SETTING_802_1X_PASSWORD
+NM_SETTING_802_1X_PASSWORD_FLAGS
+NM_SETTING_802_1X_PASSWORD_RAW
+NM_SETTING_802_1X_PASSWORD_RAW_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_PHASE2_SUBJECT_MATCH
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_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_SETTING_NAME
-NM_SETTING_802_1X_SUBJECT_MATCH
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
-nm_setting_802_1x_add_altsubject_match
+NMSetting8021x
+NMSetting8021xClass
+nm_setting_802_1x_new
+nm_setting_802_1x_get_num_eap_methods
+nm_setting_802_1x_get_eap_method
 nm_setting_802_1x_add_eap_method
-nm_setting_802_1x_add_phase2_altsubject_match
-nm_setting_802_1x_clear_altsubject_matches
+nm_setting_802_1x_remove_eap_method
 nm_setting_802_1x_clear_eap_methods
-nm_setting_802_1x_clear_phase2_altsubject_matches
-nm_setting_802_1x_error_quark
-nm_setting_802_1x_get_altsubject_match
+nm_setting_802_1x_get_identity
 nm_setting_802_1x_get_anonymous_identity
+nm_setting_802_1x_get_pac_file
+nm_setting_802_1x_get_system_ca_certs
+nm_setting_802_1x_get_ca_path
+nm_setting_802_1x_get_phase2_ca_path
+nm_setting_802_1x_get_ca_cert_scheme
 nm_setting_802_1x_get_ca_cert_blob
 nm_setting_802_1x_get_ca_cert_path
-nm_setting_802_1x_get_ca_cert_scheme
-nm_setting_802_1x_get_ca_path
+nm_setting_802_1x_set_ca_cert
+nm_setting_802_1x_get_subject_match
+nm_setting_802_1x_get_num_altsubject_matches
+nm_setting_802_1x_get_altsubject_match
+nm_setting_802_1x_add_altsubject_match
+nm_setting_802_1x_remove_altsubject_match
+nm_setting_802_1x_clear_altsubject_matches
+nm_setting_802_1x_get_client_cert_scheme
 nm_setting_802_1x_get_client_cert_blob
 nm_setting_802_1x_get_client_cert_path
-nm_setting_802_1x_get_client_cert_scheme
-nm_setting_802_1x_get_eap_method
-nm_setting_802_1x_get_identity
-nm_setting_802_1x_get_num_altsubject_matches
-nm_setting_802_1x_get_num_eap_methods
-nm_setting_802_1x_get_num_phase2_altsubject_matches
-nm_setting_802_1x_get_pac_file
-nm_setting_802_1x_get_password
-nm_setting_802_1x_get_password_flags
-nm_setting_802_1x_get_password_raw
-nm_setting_802_1x_get_password_raw_flags
-nm_setting_802_1x_get_phase1_fast_provisioning
-nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_set_client_cert
 nm_setting_802_1x_get_phase1_peapver
-nm_setting_802_1x_get_phase2_altsubject_match
+nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_get_phase1_fast_provisioning
 nm_setting_802_1x_get_phase2_auth
 nm_setting_802_1x_get_phase2_autheap
+nm_setting_802_1x_get_phase2_ca_cert_scheme
 nm_setting_802_1x_get_phase2_ca_cert_blob
 nm_setting_802_1x_get_phase2_ca_cert_path
-nm_setting_802_1x_get_phase2_ca_cert_scheme
-nm_setting_802_1x_get_phase2_ca_path
+nm_setting_802_1x_set_phase2_ca_cert
+nm_setting_802_1x_get_phase2_subject_match
+nm_setting_802_1x_get_num_phase2_altsubject_matches
+nm_setting_802_1x_get_phase2_altsubject_match
+nm_setting_802_1x_add_phase2_altsubject_match
+nm_setting_802_1x_remove_phase2_altsubject_match
+nm_setting_802_1x_clear_phase2_altsubject_matches
+nm_setting_802_1x_get_phase2_client_cert_scheme
 nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
-nm_setting_802_1x_get_phase2_client_cert_scheme
-nm_setting_802_1x_get_phase2_private_key_blob
-nm_setting_802_1x_get_phase2_private_key_format
-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_path
-nm_setting_802_1x_get_phase2_private_key_scheme
-nm_setting_802_1x_get_phase2_subject_match
+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_password_raw
+nm_setting_802_1x_get_password_raw_flags
 nm_setting_802_1x_get_pin
 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_format
+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_path
-nm_setting_802_1x_get_private_key_scheme
-nm_setting_802_1x_get_subject_match
-nm_setting_802_1x_get_system_ca_certs
-nm_setting_802_1x_new
-nm_setting_802_1x_remove_altsubject_match
-nm_setting_802_1x_remove_eap_method
-nm_setting_802_1x_remove_phase2_altsubject_match
-nm_setting_802_1x_set_ca_cert
-nm_setting_802_1x_set_client_cert
-nm_setting_802_1x_set_phase2_ca_cert
-nm_setting_802_1x_set_phase2_client_cert
+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_set_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
 
 NM_IS_SETTING_802_1X
 NM_IS_SETTING_802_1X_CLASS
@@ -232,32 +232,32 @@ nm_setting_802_1x_get_type
 

 nm-setting-adsl
 NMSettingAdsl
-NMSettingAdsl
-NMSettingAdslClass
+NM_SETTING_ADSL_SETTING_NAME
 NMSettingAdslError
-NM_SETTING_ADSL_ENCAPSULATION
-NM_SETTING_ADSL_ENCAPSULATION_LLC
-NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 NM_SETTING_ADSL_ERROR
+nm_setting_adsl_error_quark
+NM_SETTING_ADSL_USERNAME
 NM_SETTING_ADSL_PASSWORD
 NM_SETTING_ADSL_PASSWORD_FLAGS
 NM_SETTING_ADSL_PROTOCOL
-NM_SETTING_ADSL_PROTOCOL_IPOATM
+NM_SETTING_ADSL_ENCAPSULATION
+NM_SETTING_ADSL_VPI
+NM_SETTING_ADSL_VCI
 NM_SETTING_ADSL_PROTOCOL_PPPOA
 NM_SETTING_ADSL_PROTOCOL_PPPOE
-NM_SETTING_ADSL_SETTING_NAME
-NM_SETTING_ADSL_USERNAME
-NM_SETTING_ADSL_VCI
-NM_SETTING_ADSL_VPI
-nm_setting_adsl_error_quark
-nm_setting_adsl_get_encapsulation
+NM_SETTING_ADSL_PROTOCOL_IPOATM
+NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+NM_SETTING_ADSL_ENCAPSULATION_LLC
+NMSettingAdsl
+NMSettingAdslClass
+nm_setting_adsl_new
+nm_setting_adsl_get_username
 nm_setting_adsl_get_password
-nm_setting_adsl_get_password_flags
 nm_setting_adsl_get_protocol
-nm_setting_adsl_get_username
-nm_setting_adsl_get_vci
+nm_setting_adsl_get_encapsulation
 nm_setting_adsl_get_vpi
-nm_setting_adsl_new
+nm_setting_adsl_get_vci
+nm_setting_adsl_get_password_flags
 
 NM_IS_SETTING_ADSL
 NM_IS_SETTING_ADSL_CLASS
@@ -271,19 +271,19 @@ nm_setting_adsl_get_type
 

 nm-setting-bluetooth
 NMSettingBluetooth
-NMSettingBluetooth
-NMSettingBluetoothClass
+NM_SETTING_BLUETOOTH_SETTING_NAME
 NMSettingBluetoothError
-NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_ERROR
-NM_SETTING_BLUETOOTH_SETTING_NAME
+nm_setting_bluetooth_error_quark
+NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
 NM_SETTING_BLUETOOTH_TYPE_PANU
-nm_setting_bluetooth_error_quark
+NMSettingBluetooth
+NMSettingBluetoothClass
+nm_setting_bluetooth_new
 nm_setting_bluetooth_get_bdaddr
 nm_setting_bluetooth_get_connection_type
-nm_setting_bluetooth_new
 
 NM_IS_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH_CLASS
@@ -297,29 +297,29 @@ nm_setting_bluetooth_get_type
 

 nm-setting-bond
 NMSettingBond
-NMSettingBond
-NMSettingBondClass
+NM_SETTING_BOND_SETTING_NAME
 NMSettingBondError
 NM_SETTING_BOND_ERROR
+nm_setting_bond_error_quark
 NM_SETTING_BOND_INTERFACE_NAME
 NM_SETTING_BOND_OPTIONS
-NM_SETTING_BOND_OPTION_ARP_INTERVAL
-NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-NM_SETTING_BOND_OPTION_DOWNDELAY
-NM_SETTING_BOND_OPTION_MIIMON
 NM_SETTING_BOND_OPTION_MODE
+NM_SETTING_BOND_OPTION_MIIMON
+NM_SETTING_BOND_OPTION_DOWNDELAY
 NM_SETTING_BOND_OPTION_UPDELAY
-NM_SETTING_BOND_SETTING_NAME
-nm_setting_bond_add_option
-nm_setting_bond_error_quark
+NM_SETTING_BOND_OPTION_ARP_INTERVAL
+NM_SETTING_BOND_OPTION_ARP_IP_TARGET
+NMSettingBond
+NMSettingBondClass
+nm_setting_bond_new
 nm_setting_bond_get_interface_name
 nm_setting_bond_get_num_options
 nm_setting_bond_get_option
 nm_setting_bond_get_option_by_name
-nm_setting_bond_get_option_default
-nm_setting_bond_get_valid_options
-nm_setting_bond_new
+nm_setting_bond_add_option
 nm_setting_bond_remove_option
+nm_setting_bond_get_valid_options
+nm_setting_bond_get_option_default
 
 NM_IS_SETTING_BOND
 NM_IS_SETTING_BOND_CLASS
@@ -333,27 +333,27 @@ nm_setting_bond_get_type
 

 nm-setting-bridge
 NMSettingBridge
-NMSettingBridge
-NMSettingBridgeClass
+NM_SETTING_BRIDGE_SETTING_NAME
 NMSettingBridgeError
-NM_SETTING_BRIDGE_AGEING_TIME
 NM_SETTING_BRIDGE_ERROR
+nm_setting_bridge_error_quark
+NM_SETTING_BRIDGE_INTERFACE_NAME
+NM_SETTING_BRIDGE_STP
+NM_SETTING_BRIDGE_PRIORITY
 NM_SETTING_BRIDGE_FORWARD_DELAY
 NM_SETTING_BRIDGE_HELLO_TIME
-NM_SETTING_BRIDGE_INTERFACE_NAME
 NM_SETTING_BRIDGE_MAX_AGE
-NM_SETTING_BRIDGE_PRIORITY
-NM_SETTING_BRIDGE_SETTING_NAME
-NM_SETTING_BRIDGE_STP
-nm_setting_bridge_error_quark
-nm_setting_bridge_get_ageing_time
+NM_SETTING_BRIDGE_AGEING_TIME
+NMSettingBridge
+NMSettingBridgeClass
+nm_setting_bridge_new
+nm_setting_bridge_get_interface_name
+nm_setting_bridge_get_stp
+nm_setting_bridge_get_priority
 nm_setting_bridge_get_forward_delay
 nm_setting_bridge_get_hello_time
-nm_setting_bridge_get_interface_name
 nm_setting_bridge_get_max_age
-nm_setting_bridge_get_priority
-nm_setting_bridge_get_stp
-nm_setting_bridge_new
+nm_setting_bridge_get_ageing_time
 
 NM_IS_SETTING_BRIDGE
 NM_IS_SETTING_BRIDGE_CLASS
@@ -367,19 +367,19 @@ nm_setting_bridge_get_type
 

 nm-setting-bridge-port
 NMSettingBridgePort
-NMSettingBridgePort
-NMSettingBridgePortClass
+NM_SETTING_BRIDGE_PORT_SETTING_NAME
 NMSettingBridgePortError
 NM_SETTING_BRIDGE_PORT_ERROR
-NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-NM_SETTING_BRIDGE_PORT_PATH_COST
-NM_SETTING_BRIDGE_PORT_PRIORITY
-NM_SETTING_BRIDGE_PORT_SETTING_NAME
 nm_setting_bridge_port_error_quark
-nm_setting_bridge_port_get_hairpin_mode
-nm_setting_bridge_port_get_path_cost
-nm_setting_bridge_port_get_priority
+NM_SETTING_BRIDGE_PORT_PRIORITY
+NM_SETTING_BRIDGE_PORT_PATH_COST
+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NMSettingBridgePort
+NMSettingBridgePortClass
 nm_setting_bridge_port_new
+nm_setting_bridge_port_get_priority
+nm_setting_bridge_port_get_path_cost
+nm_setting_bridge_port_get_hairpin_mode
 
 NM_IS_SETTING_BRIDGE_PORT
 NM_IS_SETTING_BRIDGE_PORT_CLASS
@@ -393,21 +393,21 @@ nm_setting_bridge_port_get_type
 

 nm-setting-cdma
 NMSettingCdma
-NMSettingCdma
-NMSettingCdmaClass
+NM_SETTING_CDMA_SETTING_NAME
 NMSettingCdmaError
 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
-NM_SETTING_CDMA_SETTING_NAME
-NM_SETTING_CDMA_USERNAME
-nm_setting_cdma_error_quark
+NMSettingCdma
+NMSettingCdmaClass
+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_get_username
-nm_setting_cdma_new
 
 NM_IS_SETTING_CDMA
 NM_IS_SETTING_CDMA_CLASS
@@ -421,42 +421,42 @@ nm_setting_cdma_get_type
 

 nm-setting-connection
 NMSettingConnection
-NMSettingConnection
-NMSettingConnectionClass
+NM_SETTING_CONNECTION_SETTING_NAME
 NMSettingConnectionError
-NM_SETTING_CONNECTION_AUTOCONNECT
 NM_SETTING_CONNECTION_ERROR
+nm_setting_connection_error_quark
 NM_SETTING_CONNECTION_ID
-NM_SETTING_CONNECTION_MASTER
-NM_SETTING_CONNECTION_PERMISSIONS
-NM_SETTING_CONNECTION_READ_ONLY
-NM_SETTING_CONNECTION_SECONDARIES
-NM_SETTING_CONNECTION_SETTING_NAME
-NM_SETTING_CONNECTION_SLAVE_TYPE
-NM_SETTING_CONNECTION_TIMESTAMP
-NM_SETTING_CONNECTION_TYPE
 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
 NM_SETTING_CONNECTION_ZONE
-nm_setting_connection_add_permission
-nm_setting_connection_add_secondary
-nm_setting_connection_error_quark
-nm_setting_connection_get_autoconnect
-nm_setting_connection_get_connection_type
+NM_SETTING_CONNECTION_MASTER
+NM_SETTING_CONNECTION_SLAVE_TYPE
+NM_SETTING_CONNECTION_SECONDARIES
+NMSettingConnection
+NMSettingConnectionClass
+nm_setting_connection_new
 nm_setting_connection_get_id
-nm_setting_connection_get_master
+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_num_secondaries
 nm_setting_connection_get_permission
-nm_setting_connection_get_read_only
-nm_setting_connection_get_secondary
-nm_setting_connection_get_slave_type
-nm_setting_connection_get_timestamp
-nm_setting_connection_get_uuid
 nm_setting_connection_get_zone
-nm_setting_connection_is_slave_type
-nm_setting_connection_new
 nm_setting_connection_permissions_user_allowed
+nm_setting_connection_add_permission
 nm_setting_connection_remove_permission
+nm_setting_connection_get_master
+nm_setting_connection_is_slave_type
+nm_setting_connection_get_slave_type
+nm_setting_connection_get_num_secondaries
+nm_setting_connection_get_secondary
+nm_setting_connection_add_secondary
 nm_setting_connection_remove_secondary
 
 NM_IS_SETTING_CONNECTION
@@ -471,37 +471,37 @@ nm_setting_connection_get_type
 

 nm-setting-gsm
 NMSettingGsm
-NMSettingGsm
-NMSettingGsmClass
+NM_SETTING_GSM_SETTING_NAME
 NMSettingGsmError
-NMSettingGsmNetworkBand
-NMSettingGsmNetworkType
-NM_SETTING_GSM_ALLOWED_BANDS
-NM_SETTING_GSM_APN
 NM_SETTING_GSM_ERROR
-NM_SETTING_GSM_HOME_ONLY
-NM_SETTING_GSM_NETWORK_ID
-NM_SETTING_GSM_NETWORK_TYPE
+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_SETTING_NAME
-NM_SETTING_GSM_USERNAME
-nm_setting_gsm_error_quark
-nm_setting_gsm_get_allowed_bands
+NM_SETTING_GSM_HOME_ONLY
+NMSettingGsmNetworkType
+NMSettingGsmNetworkBand
+NMSettingGsm
+NMSettingGsmClass
+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_home_only
 nm_setting_gsm_get_network_id
 nm_setting_gsm_get_network_type
-nm_setting_gsm_get_number
-nm_setting_gsm_get_password
-nm_setting_gsm_get_password_flags
+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_username
-nm_setting_gsm_new
+nm_setting_gsm_get_password_flags
 
 NM_IS_SETTING_GSM
 NM_IS_SETTING_GSM_CLASS
@@ -515,19 +515,19 @@ nm_setting_gsm_get_type
 

 nm-setting-infiniband
 NMSettingInfiniband
-NMSettingInfiniband
-NMSettingInfinibandClass
+NM_SETTING_INFINIBAND_SETTING_NAME
 NMSettingInfinibandError
 NM_SETTING_INFINIBAND_ERROR
+nm_setting_infiniband_error_quark
 NM_SETTING_INFINIBAND_MAC_ADDRESS
 NM_SETTING_INFINIBAND_MTU
-NM_SETTING_INFINIBAND_SETTING_NAME
 NM_SETTING_INFINIBAND_TRANSPORT_MODE
-nm_setting_infiniband_error_quark
+NMSettingInfiniband
+NMSettingInfinibandClass
+nm_setting_infiniband_new
 nm_setting_infiniband_get_mac_address
 nm_setting_infiniband_get_mtu
 nm_setting_infiniband_get_transport_mode
-nm_setting_infiniband_new
 
 NM_IS_SETTING_INFINIBAND
 NM_IS_SETTING_INFINIBAND_CLASS
@@ -541,84 +541,84 @@ nm_setting_infiniband_get_type
 

 nm-setting-ip4-config
 NMSettingIP4Config
-NMIP4Address
-NMIP4Route
-NMSettingIP4Config
-NMSettingIP4ConfigClass
+NM_SETTING_IP4_CONFIG_SETTING_NAME
 NMSettingIP4ConfigError
-NM_SETTING_IP4_CONFIG_ADDRESSES
-NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+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_ERROR
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+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
 NM_SETTING_IP4_CONFIG_METHOD_AUTO
-NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 NM_SETTING_IP4_CONFIG_METHOD_SHARED
-NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP4_CONFIG_ROUTES
-NM_SETTING_IP4_CONFIG_SETTING_NAME
-nm_ip4_address_compare
-nm_ip4_address_dup
-nm_ip4_address_get_address
-nm_ip4_address_get_gateway
-nm_ip4_address_get_prefix
+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_set_gateway
+nm_ip4_address_get_prefix
 nm_ip4_address_set_prefix
-nm_ip4_address_unref
-nm_ip4_route_compare
-nm_ip4_route_dup
-nm_ip4_route_get_dest
-nm_ip4_route_get_metric
-nm_ip4_route_get_next_hop
-nm_ip4_route_get_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_set_metric
-nm_ip4_route_set_next_hop
+nm_ip4_route_get_prefix
 nm_ip4_route_set_prefix
-nm_ip4_route_unref
-nm_setting_ip4_config_add_address
+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_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_add_dns_search
-nm_setting_ip4_config_add_route
-nm_setting_ip4_config_clear_addresses
+nm_setting_ip4_config_remove_dns
 nm_setting_ip4_config_clear_dns
-nm_setting_ip4_config_clear_dns_searches
-nm_setting_ip4_config_clear_routes
-nm_setting_ip4_config_error_quark
-nm_setting_ip4_config_get_address
-nm_setting_ip4_config_get_dhcp_client_id
-nm_setting_ip4_config_get_dhcp_hostname
-nm_setting_ip4_config_get_dhcp_send_hostname
-nm_setting_ip4_config_get_dns
+nm_setting_ip4_config_get_num_dns_searches
 nm_setting_ip4_config_get_dns_search
-nm_setting_ip4_config_get_ignore_auto_dns
-nm_setting_ip4_config_get_ignore_auto_routes
-nm_setting_ip4_config_get_may_fail
-nm_setting_ip4_config_get_method
-nm_setting_ip4_config_get_never_default
+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_num_dns
-nm_setting_ip4_config_get_num_dns_searches
+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_new
-nm_setting_ip4_config_remove_address
-nm_setting_ip4_config_remove_dns
-nm_setting_ip4_config_remove_dns_search
+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_IS_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG_CLASS
@@ -634,84 +634,84 @@ nm_setting_ip4_config_get_type
 

 nm-setting-ip6-config
 NMSettingIP6Config
-NMIP6Address
-NMIP6Route
-NMSettingIP6Config
-NMSettingIP6ConfigClass
+NM_SETTING_IP6_CONFIG_SETTING_NAME
 NMSettingIP6ConfigError
-NMSettingIP6ConfigPrivacy
-NM_SETTING_IP6_CONFIG_ADDRESSES
-NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+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_ERROR
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_ROUTES
 NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
 NM_SETTING_IP6_CONFIG_MAY_FAIL
-NM_SETTING_IP6_CONFIG_METHOD
+NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_AUTO
 NM_SETTING_IP6_CONFIG_METHOD_DHCP
-NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 NM_SETTING_IP6_CONFIG_METHOD_SHARED
-NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP6_CONFIG_ROUTES
-NM_SETTING_IP6_CONFIG_SETTING_NAME
-nm_ip6_address_compare
-nm_ip6_address_dup
-nm_ip6_address_get_address
-nm_ip6_address_get_gateway
-nm_ip6_address_get_prefix
+NMSettingIP6ConfigPrivacy
+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_set_gateway
+nm_ip6_address_get_prefix
 nm_ip6_address_set_prefix
-nm_ip6_address_unref
-nm_ip6_route_compare
-nm_ip6_route_dup
-nm_ip6_route_get_dest
-nm_ip6_route_get_metric
-nm_ip6_route_get_next_hop
-nm_ip6_route_get_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_set_metric
-nm_ip6_route_set_next_hop
+nm_ip6_route_get_prefix
 nm_ip6_route_set_prefix
-nm_ip6_route_unref
-nm_setting_ip6_config_add_address
+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_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_add_dns_search
-nm_setting_ip6_config_add_route
-nm_setting_ip6_config_clear_addresses
+nm_setting_ip6_config_remove_dns
 nm_setting_ip6_config_clear_dns
-nm_setting_ip6_config_clear_dns_searches
-nm_setting_ip6_config_clear_routes
-nm_setting_ip6_config_error_quark
-nm_setting_ip6_config_get_address
-nm_setting_ip6_config_get_dhcp_hostname
-nm_setting_ip6_config_get_dns
+nm_setting_ip6_config_get_num_dns_searches
 nm_setting_ip6_config_get_dns_search
-nm_setting_ip6_config_get_ignore_auto_dns
-nm_setting_ip6_config_get_ignore_auto_routes
-nm_setting_ip6_config_get_ip6_privacy
-nm_setting_ip6_config_get_may_fail
-nm_setting_ip6_config_get_method
-nm_setting_ip6_config_get_never_default
+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_num_dns
-nm_setting_ip6_config_get_num_dns_searches
+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_new
-nm_setting_ip6_config_remove_address
-nm_setting_ip6_config_remove_dns
-nm_setting_ip6_config_remove_dns_search
+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_dhcp_hostname
+nm_setting_ip6_config_get_never_default
+nm_setting_ip6_config_get_may_fail
+nm_setting_ip6_config_get_ip6_privacy
 
 NM_IS_SETTING_IP6_CONFIG
 NM_IS_SETTING_IP6_CONFIG_CLASS
@@ -727,19 +727,19 @@ nm_setting_ip6_config_get_type
 

 nm-setting-olpc-mesh
 NMSettingOlpcMesh
-NMSettingOlpcMesh
-NMSettingOlpcMeshClass
+NM_SETTING_OLPC_MESH_SETTING_NAME
 NMSettingOlpcMeshError
-NM_SETTING_OLPC_MESH_CHANNEL
-NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 NM_SETTING_OLPC_MESH_ERROR
-NM_SETTING_OLPC_MESH_SETTING_NAME
-NM_SETTING_OLPC_MESH_SSID
 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_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_get_ssid
-nm_setting_olpc_mesh_new
 
 NM_IS_SETTING_OLPC_MESH
 NM_IS_SETTING_OLPC_MESH_CLASS
@@ -753,49 +753,49 @@ nm_setting_olpc_mesh_get_type
 

 nm-setting-ppp
 NMSettingPPP
-NMSettingPPP
-NMSettingPPPClass
+NM_SETTING_PPP_SETTING_NAME
 NMSettingPPPError
-NM_SETTING_PPP_BAUD
-NM_SETTING_PPP_CRTSCTS
 NM_SETTING_PPP_ERROR
-NM_SETTING_PPP_LCP_ECHO_FAILURE
-NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NM_SETTING_PPP_MPPE_STATEFUL
-NM_SETTING_PPP_MRU
-NM_SETTING_PPP_MTU
+nm_setting_ppp_error_quark
 NM_SETTING_PPP_NOAUTH
-NM_SETTING_PPP_NOBSDCOMP
-NM_SETTING_PPP_NODEFLATE
-NM_SETTING_PPP_NO_VJ_COMP
-NM_SETTING_PPP_REFUSE_CHAP
 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_REFUSE_PAP
+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_SETTING_NAME
-nm_setting_ppp_error_quark
-nm_setting_ppp_get_baud
-nm_setting_ppp_get_crtscts
-nm_setting_ppp_get_lcp_echo_failure
-nm_setting_ppp_get_lcp_echo_interval
-nm_setting_ppp_get_mppe_stateful
-nm_setting_ppp_get_mru
-nm_setting_ppp_get_mtu
-nm_setting_ppp_get_no_vj_comp
+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_new
 nm_setting_ppp_get_noauth
-nm_setting_ppp_get_nobsdcomp
-nm_setting_ppp_get_nodeflate
-nm_setting_ppp_get_refuse_chap
 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_refuse_pap
+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_new
+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_IS_SETTING_PPP
 NM_IS_SETTING_PPP_CLASS
@@ -809,21 +809,21 @@ nm_setting_ppp_get_type
 

 nm-setting-pppoe
 NMSettingPPPOE
-NMSettingPPPOE
-NMSettingPPPOEClass
+NM_SETTING_PPPOE_SETTING_NAME
 NMSettingPPPOEError
 NM_SETTING_PPPOE_ERROR
-NM_SETTING_PPPOE_PASSWORD
-NM_SETTING_PPPOE_PASSWORD_FLAGS
+nm_setting_pppoe_error_quark
 NM_SETTING_PPPOE_SERVICE
-NM_SETTING_PPPOE_SETTING_NAME
 NM_SETTING_PPPOE_USERNAME
-nm_setting_pppoe_error_quark
-nm_setting_pppoe_get_password
-nm_setting_pppoe_get_password_flags
+NM_SETTING_PPPOE_PASSWORD
+NM_SETTING_PPPOE_PASSWORD_FLAGS
+NMSettingPPPOE
+NMSettingPPPOEClass
+nm_setting_pppoe_new
 nm_setting_pppoe_get_service
 nm_setting_pppoe_get_username
-nm_setting_pppoe_new
+nm_setting_pppoe_get_password
+nm_setting_pppoe_get_password_flags
 
 NM_IS_SETTING_PPPOE
 NM_IS_SETTING_PPPOE_CLASS
@@ -836,30 +836,30 @@ nm_setting_pppoe_get_type
 
 

 nm-setting-private
-NM_SETTING_REGISTER_TYPE
 NM_SETTING_SECRET_FLAGS_ALL
+NM_SETTING_REGISTER_TYPE
 

 
 

 nm-setting-serial
 NMSettingSerial
-NMSettingSerial
-NMSettingSerialClass
+NM_SETTING_SERIAL_SETTING_NAME
 NMSettingSerialError
+NM_SETTING_SERIAL_ERROR
+nm_setting_serial_error_quark
 NM_SETTING_SERIAL_BAUD
 NM_SETTING_SERIAL_BITS
-NM_SETTING_SERIAL_ERROR
 NM_SETTING_SERIAL_PARITY
-NM_SETTING_SERIAL_SEND_DELAY
-NM_SETTING_SERIAL_SETTING_NAME
 NM_SETTING_SERIAL_STOPBITS
-nm_setting_serial_error_quark
+NM_SETTING_SERIAL_SEND_DELAY
+NMSettingSerial
+NMSettingSerialClass
+nm_setting_serial_new
 nm_setting_serial_get_baud
 nm_setting_serial_get_bits
 nm_setting_serial_get_parity
-nm_setting_serial_get_send_delay
 nm_setting_serial_get_stopbits
-nm_setting_serial_new
+nm_setting_serial_get_send_delay
 
 NM_IS_SETTING_SERIAL
 NM_IS_SETTING_SERIAL_CLASS
@@ -873,31 +873,31 @@ nm_setting_serial_get_type
 

 nm-setting-vlan
 NMSettingVlan
-NMSettingVlan
-NMSettingVlanClass
+NM_SETTING_VLAN_SETTING_NAME
 NMSettingVlanError
-NMVlanFlags
-NMVlanPriorityMap
-NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
 NM_SETTING_VLAN_ERROR
-NM_SETTING_VLAN_FLAGS
-NM_SETTING_VLAN_ID
-NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+nm_setting_vlan_error_quark
 NM_SETTING_VLAN_INTERFACE_NAME
 NM_SETTING_VLAN_PARENT
-NM_SETTING_VLAN_SETTING_NAME
-nm_setting_vlan_add_priority
-nm_setting_vlan_add_priority_str
-nm_setting_vlan_clear_priorities
-nm_setting_vlan_error_quark
-nm_setting_vlan_get_flags
-nm_setting_vlan_get_id
+NM_SETTING_VLAN_ID
+NM_SETTING_VLAN_FLAGS
+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+NMSettingVlan
+NMSettingVlanClass
+NMVlanPriorityMap
+NMVlanFlags
+nm_setting_vlan_new
 nm_setting_vlan_get_interface_name
-nm_setting_vlan_get_num_priorities
 nm_setting_vlan_get_parent
+nm_setting_vlan_get_id
+nm_setting_vlan_get_flags
+nm_setting_vlan_get_num_priorities
 nm_setting_vlan_get_priority
-nm_setting_vlan_new
+nm_setting_vlan_add_priority
 nm_setting_vlan_remove_priority
+nm_setting_vlan_clear_priorities
+nm_setting_vlan_add_priority_str
 
 NM_IS_SETTING_VLAN
 NM_IS_SETTING_VLAN_CLASS
@@ -911,30 +911,30 @@ nm_setting_vlan_get_type
 

 nm-setting-vpn
 NMSettingVPN
-NMSettingVPN
-NMSettingVPNClass
+NM_SETTING_VPN_SETTING_NAME
 NMSettingVpnError
-NMVPNIterFunc
-NM_SETTING_VPN_DATA
 NM_SETTING_VPN_ERROR
-NM_SETTING_VPN_SECRETS
+nm_setting_vpn_error_quark
 NM_SETTING_VPN_SERVICE_TYPE
-NM_SETTING_VPN_SETTING_NAME
 NM_SETTING_VPN_USER_NAME
+NM_SETTING_VPN_DATA
+NM_SETTING_VPN_SECRETS
+NMSettingVPN
+NMSettingVPNClass
+NMVPNIterFunc
+nm_setting_vpn_new
+nm_setting_vpn_get_service_type
+nm_setting_vpn_get_user_name
+nm_setting_vpn_get_num_data_items
 nm_setting_vpn_add_data_item
-nm_setting_vpn_add_secret
-nm_setting_vpn_error_quark
-nm_setting_vpn_foreach_data_item
-nm_setting_vpn_foreach_secret
 nm_setting_vpn_get_data_item
-nm_setting_vpn_get_num_data_items
+nm_setting_vpn_remove_data_item
+nm_setting_vpn_foreach_data_item
 nm_setting_vpn_get_num_secrets
+nm_setting_vpn_add_secret
 nm_setting_vpn_get_secret
-nm_setting_vpn_get_service_type
-nm_setting_vpn_get_user_name
-nm_setting_vpn_new
-nm_setting_vpn_remove_data_item
 nm_setting_vpn_remove_secret
+nm_setting_vpn_foreach_secret
 
 NM_IS_SETTING_VPN
 NM_IS_SETTING_VPN_CLASS
@@ -948,17 +948,17 @@ nm_setting_vpn_get_type
 

 nm-setting-wimax
 NMSettingWimax
-NMSettingWimax
-NMSettingWimaxClass
+NM_SETTING_WIMAX_SETTING_NAME
 NMSettingWimaxError
 NM_SETTING_WIMAX_ERROR
-NM_SETTING_WIMAX_MAC_ADDRESS
-NM_SETTING_WIMAX_NETWORK_NAME
-NM_SETTING_WIMAX_SETTING_NAME
 nm_setting_wimax_error_quark
-nm_setting_wimax_get_mac_address
-nm_setting_wimax_get_network_name
+NM_SETTING_WIMAX_NETWORK_NAME
+NM_SETTING_WIMAX_MAC_ADDRESS
+NMSettingWimax
+NMSettingWimaxClass
 nm_setting_wimax_new
+nm_setting_wimax_get_network_name
+nm_setting_wimax_get_mac_address
 
 NM_IS_SETTING_WIMAX
 NM_IS_SETTING_WIMAX_CLASS
@@ -972,38 +972,38 @@ nm_setting_wimax_get_type
 

 nm-setting-wired
 NMSettingWired
-NMSettingWired
-NMSettingWiredClass
+NM_SETTING_WIRED_SETTING_NAME
 NMSettingWiredError
-NM_SETTING_WIRED_AUTO_NEGOTIATE
-NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-NM_SETTING_WIRED_DUPLEX
 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_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRED_MTU
-NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_S390_SUBCHANNELS
 NM_SETTING_WIRED_S390_NETTYPE
 NM_SETTING_WIRED_S390_OPTIONS
-NM_SETTING_WIRED_S390_SUBCHANNELS
-NM_SETTING_WIRED_SETTING_NAME
-NM_SETTING_WIRED_SPEED
-nm_setting_wired_add_s390_option
-nm_setting_wired_error_quark
-nm_setting_wired_get_auto_negotiate
-nm_setting_wired_get_cloned_mac_address
+NMSettingWired
+NMSettingWiredClass
+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_mac_address_blacklist
 nm_setting_wired_get_mtu
-nm_setting_wired_get_num_s390_options
-nm_setting_wired_get_port
+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_get_s390_subchannels
-nm_setting_wired_get_speed
-nm_setting_wired_new
+nm_setting_wired_add_s390_option
 nm_setting_wired_remove_s390_option
 
 NM_IS_SETTING_WIRED
@@ -1018,47 +1018,47 @@ nm_setting_wired_get_type
 

 nm-setting-wireless
 NMSettingWireless
-NMSettingWireless
-NMSettingWirelessClass
+NM_SETTING_WIRELESS_SETTING_NAME
 NMSettingWirelessError
+NM_SETTING_WIRELESS_ERROR
+nm_setting_wireless_error_quark
+NM_SETTING_WIRELESS_SSID
+NM_SETTING_WIRELESS_MODE
 NM_SETTING_WIRELESS_BAND
-NM_SETTING_WIRELESS_BSSID
 NM_SETTING_WIRELESS_CHANNEL
-NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-NM_SETTING_WIRELESS_ERROR
-NM_SETTING_WIRELESS_HIDDEN
+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_MAC_ADDRESS_BLACKLIST
-NM_SETTING_WIRELESS_MODE
+NM_SETTING_WIRELESS_MTU
+NM_SETTING_WIRELESS_SEEN_BSSIDS
+NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_HIDDEN
 NM_SETTING_WIRELESS_MODE_ADHOC
 NM_SETTING_WIRELESS_MODE_AP
 NM_SETTING_WIRELESS_MODE_INFRA
-NM_SETTING_WIRELESS_MTU
-NM_SETTING_WIRELESS_RATE
-NM_SETTING_WIRELESS_SEC
-NM_SETTING_WIRELESS_SEEN_BSSIDS
-NM_SETTING_WIRELESS_SETTING_NAME
-NM_SETTING_WIRELESS_SSID
-NM_SETTING_WIRELESS_TX_POWER
-nm_setting_wireless_add_seen_bssid
-nm_setting_wireless_ap_security_compatible
-nm_setting_wireless_error_quark
+NMSettingWireless
+NMSettingWirelessClass
+nm_setting_wireless_new
+nm_setting_wireless_get_ssid
+nm_setting_wireless_get_mode
 nm_setting_wireless_get_band
-nm_setting_wireless_get_bssid
 nm_setting_wireless_get_channel
-nm_setting_wireless_get_cloned_mac_address
-nm_setting_wireless_get_hidden
+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_mac_address_blacklist
-nm_setting_wireless_get_mode
 nm_setting_wireless_get_mtu
-nm_setting_wireless_get_num_seen_bssids
-nm_setting_wireless_get_rate
 nm_setting_wireless_get_security
+nm_setting_wireless_get_hidden
+nm_setting_wireless_add_seen_bssid
+nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid
-nm_setting_wireless_get_ssid
-nm_setting_wireless_get_tx_power
-nm_setting_wireless_new
+nm_setting_wireless_ap_security_compatible
 
 NM_IS_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS_CLASS
@@ -1072,58 +1072,58 @@ nm_setting_wireless_get_type
 

 nm-setting-wireless-security
 NMSettingWirelessSecurity
-NMSettingWirelessSecurity
-NMSettingWirelessSecurityClass
+NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 NMSettingWirelessSecurityError
+NM_SETTING_WIRELESS_SECURITY_ERROR
+nm_setting_wireless_security_error_quark
 NMWepKeyType
+NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-NM_SETTING_WIRELESS_SECURITY_ERROR
+NM_SETTING_WIRELESS_SECURITY_PROTO
+NM_SETTING_WIRELESS_SECURITY_PAIRWISE
 NM_SETTING_WIRELESS_SECURITY_GROUP
-NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-NM_SETTING_WIRELESS_SECURITY_PROTO
-NM_SETTING_WIRELESS_SECURITY_PSK
-NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 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_WEP_TX_KEYIDX
-nm_setting_wireless_security_add_group
-nm_setting_wireless_security_add_pairwise
+NM_SETTING_WIRELESS_SECURITY_PSK
+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+NMSettingWirelessSecurity
+NMSettingWirelessSecurityClass
+nm_setting_wireless_security_new
+nm_setting_wireless_security_get_key_mgmt
+nm_setting_wireless_security_get_num_protos
+nm_setting_wireless_security_get_proto
 nm_setting_wireless_security_add_proto
-nm_setting_wireless_security_clear_groups
-nm_setting_wireless_security_clear_pairwise
+nm_setting_wireless_security_remove_proto
 nm_setting_wireless_security_clear_protos
-nm_setting_wireless_security_error_quark
-nm_setting_wireless_security_get_auth_alg
-nm_setting_wireless_security_get_group
-nm_setting_wireless_security_get_key_mgmt
-nm_setting_wireless_security_get_leap_password
-nm_setting_wireless_security_get_leap_password_flags
-nm_setting_wireless_security_get_leap_username
-nm_setting_wireless_security_get_num_groups
 nm_setting_wireless_security_get_num_pairwise
-nm_setting_wireless_security_get_num_protos
 nm_setting_wireless_security_get_pairwise
-nm_setting_wireless_security_get_proto
+nm_setting_wireless_security_add_pairwise
+nm_setting_wireless_security_remove_pairwise
+nm_setting_wireless_security_clear_pairwise
+nm_setting_wireless_security_get_num_groups
+nm_setting_wireless_security_get_group
+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_get_wep_tx_keyidx
-nm_setting_wireless_security_new
-nm_setting_wireless_security_remove_group
-nm_setting_wireless_security_remove_pairwise
-nm_setting_wireless_security_remove_proto
-nm_setting_wireless_security_set_wep_key
 
 NM_IS_SETTING_WIRELESS_SECURITY
 NM_IS_SETTING_WIRELESS_SECURITY_CLASS
@@ -1136,48 +1136,48 @@ nm_setting_wireless_security_get_type
 
 

 nm-utils
-NMUtilsSecurityType
-NM_UTILS_HWADDR_LEN_MAX
-nm_utils_ap_mode_security_valid
+nm_utils_init
 nm_utils_deinit
+nm_utils_is_empty_ssid
 nm_utils_escape_ssid
-nm_utils_file_is_pkcs12
+nm_utils_same_ssid
+nm_utils_ssid_to_utf8
 nm_utils_gvalue_hash_dup
-nm_utils_hwaddr_atoba
-nm_utils_hwaddr_aton
-nm_utils_hwaddr_len
-nm_utils_hwaddr_ntoa
-nm_utils_hwaddr_type
-nm_utils_iface_valid_name
-nm_utils_init
+nm_utils_slist_free
+NMUtilsSecurityType
+nm_utils_security_valid
+nm_utils_ap_mode_security_valid
+nm_utils_wep_key_valid
+nm_utils_wpa_psk_valid
 nm_utils_ip4_addresses_from_gvalue
 nm_utils_ip4_addresses_to_gvalue
-nm_utils_ip4_get_default_prefix
-nm_utils_ip4_netmask_to_prefix
-nm_utils_ip4_prefix_to_netmask
 nm_utils_ip4_routes_from_gvalue
 nm_utils_ip4_routes_to_gvalue
+nm_utils_ip4_netmask_to_prefix
+nm_utils_ip4_prefix_to_netmask
+nm_utils_ip4_get_default_prefix
 nm_utils_ip6_addresses_from_gvalue
 nm_utils_ip6_addresses_to_gvalue
-nm_utils_ip6_dns_from_gvalue
-nm_utils_ip6_dns_to_gvalue
 nm_utils_ip6_routes_from_gvalue
 nm_utils_ip6_routes_to_gvalue
-nm_utils_is_empty_ssid
-nm_utils_is_uuid
-nm_utils_rsa_key_encrypt
-nm_utils_same_ssid
-nm_utils_security_valid
-nm_utils_slist_free
-nm_utils_ssid_to_utf8
+nm_utils_ip6_dns_from_gvalue
+nm_utils_ip6_dns_to_gvalue
 nm_utils_uuid_generate
 nm_utils_uuid_generate_from_string
-nm_utils_wep_key_valid
+nm_utils_rsa_key_encrypt
+nm_utils_file_is_pkcs12
+nm_utils_wifi_freq_to_channel
 nm_utils_wifi_channel_to_freq
 nm_utils_wifi_find_next_channel
-nm_utils_wifi_freq_to_channel
 nm_utils_wifi_is_channel_valid
-nm_utils_wpa_psk_valid
+NM_UTILS_HWADDR_LEN_MAX
+nm_utils_hwaddr_len
+nm_utils_hwaddr_type
+nm_utils_hwaddr_ntoa
+nm_utils_hwaddr_atoba
+nm_utils_hwaddr_aton
+nm_utils_iface_valid_name
+nm_utils_is_uuid
 

 
 

diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index f6a97532..e8491ee1 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -22,99 +22,98 @@ NMConnection
 
 
 
-
+
 
 
 
 
+@NM_CONNECTION_ERROR_UNKNOWN: 
+@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
+@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
+@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
 
-
+
 
 
 
 
-@nmconnection: the object which received the signal.
 
-
+
+
 
 
 
 
-@nmconnection: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@secrets_updated: 
 
-
+
 
 
 
 
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
+@nmconnection: the object which received the signal.
 
-
+
 
 
 
 
+@nmconnection: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
-@connection: 
-@setting: 
-
+@parent: 
+@secrets_updated: 
 
-
+
 
 
 
 
-@connection: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@func: 
-@user_data: 
+@hash: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
+@connection: 
 @Returns: 
 
 
@@ -127,128 +126,138 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
+@connection: 
+@setting: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_type: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@connection: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@func: 
-@user_data: 
+@new_settings: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@a: 
+@b: 
+@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@a: 
+@b: 
+@flags: 
+@out_settings: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_type: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
+@hints: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_name: 
+@secrets: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@path: 
 
 
-
+
 
 
 
@@ -257,71 +266,72 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@name: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @connection: 
+@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@error_quark: 
 @Returns: 
 
 
-
+
 
 
 
@@ -330,7 +340,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -339,7 +349,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -348,7 +358,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -357,7 +367,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -366,7 +376,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -375,7 +385,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -384,7 +394,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -393,7 +403,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -402,7 +412,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -411,7 +421,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -420,7 +430,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -429,121 +439,111 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@name: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@error_quark: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@hints: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@hash: 
-@error: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_type: 
+@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@new_settings: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@path: 
+@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_name: 
-@secrets: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index f8ab2c77..881d2e94 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -22,509 +22,519 @@ 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: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@altsubject_match: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@eap: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@phase2_altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@eap: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
@@ -537,7 +547,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -546,7 +556,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -555,7 +565,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -564,7 +574,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -573,7 +583,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -582,7 +592,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -591,7 +601,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -600,17 +610,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -628,43 +641,44 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -673,7 +687,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -682,7 +696,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -691,16 +705,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -709,7 +727,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -718,13 +736,12 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
@@ -746,7 +763,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -755,7 +772,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -764,7 +781,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -773,16 +790,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -791,7 +812,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -800,43 +821,44 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@phase2_altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -845,7 +867,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -854,7 +876,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -863,16 +885,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -881,7 +907,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -890,7 +916,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -899,7 +925,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -908,7 +934,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -917,7 +943,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -926,7 +952,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -935,7 +961,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -944,7 +970,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -953,128 +979,112 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@key_path: 
+@password: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
+@key_path: 
+@password: 
 @scheme: 
 @out_format: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 0e209bc2..4b3716ef 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -22,110 +22,95 @@ NMSettingAdsl
 
 
 
-
+
 
 
 
 
 
-
-
 
-
-
-
+
 
 
 
 
-
-
-
-
+@NM_SETTING_ADSL_ERROR_UNKNOWN: 
+@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -139,67 +124,82 @@ NMSettingAdsl
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -208,7 +208,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -226,7 +226,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -235,7 +235,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -244,7 +244,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -253,12 +253,12 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index cc64b574..3a9c9773 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -22,32 +22,12 @@ NMSettingBluetooth
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-
-
-
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
 
 
@@ -59,21 +39,23 @@ NMSettingBluetooth
 @NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
@@ -101,25 +83,43 @@ NMSettingBluetooth
 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
 
+
+
+
+
 
-
+
 
 
 
 
-@setting: 
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -128,12 +128,12 @@ NMSettingBluetooth
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index caa8b37a..2500beed 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -22,32 +22,12 @@ NMSettingBond
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-
-
 
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
 
 
@@ -67,6 +47,15 @@ NMSettingBond
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
@@ -81,14 +70,14 @@ NMSettingBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -102,46 +91,55 @@ NMSettingBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
+
+
 
-
+
+
+
 
 
 
 
-@setting: 
-@name: 
-@value: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -190,35 +188,37 @@ NMSettingBond
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @name: 
+@value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
index 6e1b473b..692cb73d 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -22,48 +22,46 @@ NMSettingBridgePort
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
@@ -77,46 +75,48 @@ NMSettingBridgePort
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,7 +125,7 @@ NMSettingBridgePort
 @Returns: 
 
 
-
+
 
 
 
@@ -134,12 +134,12 @@ NMSettingBridgePort
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
index 7e2cb5a4..bf9593e5 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -22,149 +22,149 @@ NMSettingBridge
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -173,7 +173,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -182,7 +182,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -191,7 +191,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -200,7 +200,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -209,7 +209,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -218,12 +218,12 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 5d065170..4c90acb1 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -22,61 +22,47 @@ 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: 
 
-
+
 
 
 
 
-
-
 
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
@@ -97,39 +83,53 @@ NMSettingCdma
 
 
 
-
+
 
 
 
 
 
+
+
+
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
@@ -156,12 +156,12 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 81d6801c..aa04897e 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -22,104 +22,90 @@ 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: 
+@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@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: 
-@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -133,101 +119,111 @@ NMSettingConnection
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@sec_uuid: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -245,7 +241,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -254,7 +250,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -263,7 +259,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -272,7 +268,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -294,7 +290,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -303,35 +299,38 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
+@uname: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@ptype: 
+@pitem: 
+@detail: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@idx: 
 
 
-
+
 
 
 
@@ -340,51 +339,52 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@uname: 
+@idx: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
+@sec_uuid: 
+@Returns: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 0d29a11a..d73ab6df 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -22,121 +22,87 @@ 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: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
 
-
+
+
 
 
 
 
-@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: 
-@NM_SETTING_GSM_BAND_U2600: 
 
-
+
+
 
 
 
 
-@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_NETWORK_TYPE_PREFER_4G: 
-@NM_SETTING_GSM_NETWORK_TYPE_4G: 
+
 
 
 
@@ -145,14 +111,14 @@ NMSettingGsm
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -166,88 +132,122 @@ NMSettingGsm
 
 
 
-
+
 
 
 
 
+@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_NETWORK_TYPE_PREFER_4G: 
+@NM_SETTING_GSM_NETWORK_TYPE_4G: 
 
-
-
+
 
 
 
 
+@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: 
+@NM_SETTING_GSM_BAND_U2600: 
 
-
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -256,7 +256,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -265,7 +265,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -274,7 +274,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -283,7 +283,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -292,7 +292,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -301,7 +301,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -319,7 +319,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -328,7 +328,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -337,12 +337,12 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 02a59881..39f397eb 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -22,83 +22,92 @@ NMSettingInfiniband
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
+@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
-@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -134,12 +143,3 @@ NMSettingInfiniband
 @Returns: 
 
 
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 4b915f2b..ea5b49c9 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -22,106 +22,82 @@ 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: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
@@ -135,145 +111,156 @@ NMSettingIP4Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@addr: 
 
 
-
+
 
 
 
 
 @address: 
-@other: 
 @Returns: 
 
 
-
+
 
 
 
 
-@source: 
-@Returns: 
+@address: 
+@prefix: 
 
 
-
+
 
 
 
@@ -282,25 +269,22 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@gateway: 
 
 
-
+
 
 
 
 
-@address: 
-@Returns: 
-
 
-
+
 
 
 
@@ -309,78 +293,78 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@address: 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@addr: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@gateway: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@prefix: 
+@route: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
+@route: 
+@Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@other: 
-@Returns: 
+@dest: 
 
 
-
+
 
 
 
 
-@source: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@prefix: 
 
 
-
+
 
 
 
@@ -389,16 +373,16 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@next_hop: 
 
 
-
+
 
 
 
@@ -407,132 +391,149 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@route: 
+@metric: 
 
 
-
+
 
 
 
 
-@route: 
 
+
+
 
-
+
+
+
 
 
 
 
-@route: 
-@dest: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@metric: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@next_hop: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@prefix: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@address: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
-@dns: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
@@ -540,16 +541,16 @@ NMSettingIP4Config
 @setting: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -559,44 +560,43 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
@@ -606,34 +606,34 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -642,43 +642,44 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -687,58 +688,57 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index 3e5af03a..df2fbec4 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -22,269 +22,252 @@ 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: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
-@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
+@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
 
-
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@other: 
-@Returns: 
+@addr: 
 
 
-
+
 
 
 
 
-@source: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@prefix: 
 
 
 
@@ -296,87 +279,84 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@gateway: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
 
-
+
 
 
 
 
-@address: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@addr: 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@gateway: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@prefix: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
+@route: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@other: 
 @Returns: 
 
 
-
+
 
 
 
 
-@source: 
-@Returns: 
+@route: 
+@dest: 
 
 
-
+
 
 
 
@@ -385,13 +365,13 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@prefix: 
 
 
 
@@ -403,141 +383,162 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@next_hop: 
 
 
-
+
 
 
 
 
-@void: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
+@metric: 
 
 
-
+
 
 
 
 
-@route: 
-@dest: 
 
+
+
 
-
+
+
+
 
 
 
 
-@route: 
-@metric: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@next_hop: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@prefix: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@address: 
-@Returns: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@dns: 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
@@ -545,16 +546,16 @@ NMSettingIP6Config
 @setting: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -564,36 +565,34 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @i: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
-@Returns: 
 
 
-
+
 
 
 
@@ -602,43 +601,44 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -647,94 +647,94 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 9a1e720e..6d525379 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -22,46 +22,44 @@ NMSettingOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
+@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
+
 
 
 
@@ -77,46 +75,48 @@ NMSettingOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,7 +125,7 @@ NMSettingOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
@@ -134,12 +134,12 @@ NMSettingOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 90815380..69cf509c 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -22,159 +22,131 @@ 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: 
 
-
+
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -195,109 +167,137 @@ NMSettingPPP
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -306,7 +306,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -315,7 +315,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -324,7 +324,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -333,7 +333,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -342,7 +342,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -351,7 +351,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -360,7 +360,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -369,7 +369,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -378,7 +378,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -387,7 +387,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -396,7 +396,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -405,7 +405,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -414,7 +414,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -423,7 +423,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -432,7 +432,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -441,7 +441,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -450,12 +450,12 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 3c022169..1ab1ae55 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -22,54 +22,47 @@ 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: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
 
-
+
+
 
 
 
@@ -90,46 +83,53 @@ NMSettingPPPOE
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
@@ -156,12 +156,12 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index 8c990ffc..75ebe7a9 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -22,18 +22,18 @@ nm-setting-private
 
 
 
-
+
 
 
 
 
-@x: 
 
 
-
+
 
 
 
 
+@x: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index f0313441..b79ec0a9 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -22,108 +22,117 @@ 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: 
 
-
+
+
 
 
 
 
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -159,15 +168,6 @@ NMSettingSerial
 @Returns: 
 
 
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
 
 
 
@@ -177,12 +177,12 @@ NMSettingSerial
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index f7d67364..47b44bd6 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -22,178 +22,173 @@ NMSettingVlan
 
 
 
-
+
 
 
 
 
 
-
-
 
-
-
-
+
 
 
 
 
-
+@NM_SETTING_VLAN_ERROR_UNKNOWN: 
+@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_VLAN_ERROR_UNKNOWN: 
-@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
 
-
+
+
 
 
 
 
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-
+
+
 
 
 
 
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
-
+
 
 
 
 
+@NM_VLAN_INGRESS_MAP: 
+@NM_VLAN_EGRESS_MAP: 
 
-
-
+
 
 
 
 
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
+@NM_VLAN_FLAG_REORDER_HEADERS: 
+@NM_VLAN_FLAG_GVRP: 
+@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-
+
 
 
 
 
-@setting: 
-@map: 
-@str: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@map: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -202,7 +197,7 @@ NMSettingVlan
 @Returns: 
 
 
-
+
 
 
 
@@ -211,35 +206,42 @@ NMSettingVlan
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@map: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @map: 
+@idx: 
+@out_from: 
+@out_to: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@map: 
+@from: 
+@to: 
 @Returns: 
 
 
-
+
 
 
 
@@ -247,27 +249,25 @@ NMSettingVlan
 @setting: 
 @map: 
 @idx: 
-@out_from: 
-@out_to: 
-@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@map: 
 
 
-
+
 
 
 
 
 @setting: 
 @map: 
-@idx: 
+@str: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 567776c1..4b323f35 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -22,60 +22,50 @@ NMSettingVPN
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_VPN_ERROR_UNKNOWN: 
+@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
-@key: 
-@value: 
-@user_data: 
 
 
 
@@ -85,129 +75,136 @@ NMSettingVPN
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
-
+
 
 
 
 
-@setting: 
 @key: 
-@item: 
+@value: 
+@user_data: 
 
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@secret: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@func: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@func: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @key: 
-@Returns: 
+@item: 
 
 
-
+
 
 
 
 
 @setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@key: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
@@ -216,25 +213,27 @@ NMSettingVPN
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@key: 
+@secret: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
@@ -243,12 +242,13 @@ NMSettingVPN
 @key: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
+@func: 
+@user_data: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 0b96fa9f..151e723e 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -22,39 +22,39 @@ NMSettingWimax
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
+@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-@parent: 
 
-
+
+
 
 
 
 
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
@@ -68,35 +68,35 @@ NMSettingWimax
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
@@ -109,12 +109,12 @@ NMSettingWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 09fb963a..893a9c06 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -22,88 +22,67 @@ 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: 
 
-
+
+
 
 
 
 
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
@@ -117,95 +96,114 @@ NMSettingWired
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@item: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -214,7 +212,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -223,7 +221,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -241,7 +239,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -250,7 +248,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -259,7 +257,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -268,7 +266,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -277,7 +275,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -286,7 +284,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -295,52 +293,54 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
-@out_key: 
-@out_value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@idx: 
+@out_key: 
+@out_value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
+@key: 
+@item: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce9..7c8b7dc8 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -22,380 +22,381 @@ 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: 
 
-
+
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@group: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@pairwise: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@proto: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@proto: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@pairwise: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
 
@@ -407,42 +408,41 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@group: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @i: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
-@Returns: 
 
 
 
@@ -463,17 +463,16 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
 @Returns: 
 
 
-
+
 
 
 
@@ -482,7 +481,7 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
@@ -491,58 +490,59 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@idx: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@idx: 
+@key: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
-@key: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index a74c82ef..e390bb09 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -22,119 +22,90 @@ 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: 
 
-
+
 
 
 
 
-@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: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -148,35 +119,35 @@ NMSettingWireless
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -204,89 +175,112 @@ NMSettingWireless
 
 
 
-
+
 
 
 
 
 
+
+
+
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@bssid: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -295,7 +289,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -313,7 +307,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -322,7 +316,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -331,7 +325,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -340,7 +334,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -349,7 +343,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -358,7 +352,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -367,7 +361,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -376,7 +370,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -385,7 +379,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -394,17 +388,17 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@bssid: 
 @Returns: 
 
 
-
+
 
 
 
@@ -413,21 +407,27 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@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
index 2067408a..d5df34e5 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -22,84 +22,66 @@ NMSetting
 
 
 
-
+
 
 
 
 
+@NM_SETTING_ERROR_UNKNOWN: 
+@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
+@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
+@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@verify: 
-@need_secrets: 
-@update_one_secret: 
-@get_secret_flags: 
-@set_secret_flags: 
-@compare_property: 
-@clear_secrets_with_flags: 
-@get_virtual_iface_name: 
-@_reserved1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
 
 
-
+
 
 
 
 
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
 
-
+
+
 
 
 
 
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
 
-
+
+
 
 
 
 
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
 
-
+
+
 
 
 
 
-@NM_SETTING_HASH_FLAG_ALL: 
-@NM_SETTING_HASH_FLAG_NO_SECRETS: 
-@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
+
 
 
 
@@ -111,152 +93,171 @@ NMSetting
 @NM_SETTING_SECRET_FLAG_NOT_SAVED: 
 @NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
+@NM_SETTING_COMPARE_FLAG_EXACT: 
+@NM_SETTING_COMPARE_FLAG_FUZZY: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+@setting: 
+@secret: 
+@flags: 
+@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
+@parent: 
+@verify: 
+@need_secrets: 
+@update_one_secret: 
+@get_secret_flags: 
+@set_secret_flags: 
+@compare_property: 
+@clear_secrets_with_flags: 
+@get_virtual_iface_name: 
+@_reserved1: 
 
-
-
+
 
 
 
 
+@setting: 
+@key: 
+@value: 
+@flags: 
+@user_data: 
 
 
-
+
 
 
 
 
+@NM_SETTING_HASH_FLAG_ALL: 
+@NM_SETTING_HASH_FLAG_NO_SECRETS: 
+@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
 
-
-
+
 
 
 
 
 @setting: 
+@flags: 
+@Returns: 
 
 
-
+
 
 
 
 
-@setting: 
-@func: 
-@user_data: 
+@setting_type: 
+@hash: 
+@Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@all_settings: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@setting: 
-@func: 
-@user_data: 
+@a: 
+@b: 
+@flags: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@NM_SETTING_DIFF_RESULT_UNKNOWN: 
+@NM_SETTING_DIFF_RESULT_IN_A: 
+@NM_SETTING_DIFF_RESULT_IN_B: 
 
-
+
 
 
 
 
-@setting: 
+@a: 
+@b: 
+@flags: 
+@invert_results: 
+@results: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
@@ -265,75 +266,74 @@ NMSetting
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
-@setting_type: 
-@hash: 
-@Returns: 
+@setting: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @setting: 
-@secret_name: 
-@flags: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@flags: 
+@secrets: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@secret_name: 
+@out_flags: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@secrets: 
+@secret_name: 
+@flags: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@all_settings: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index acb59fe9..f4ae27dd 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -22,44 +22,31 @@ nm-utils
 
 
 
-
-
-
-
-
-@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: 
-
-
+
 
 
 
 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@type: 
-@wifi_caps: 
-@Returns: 
+@void: 
 
 
-
+
 
 
 
 
-@void: 
+@ssid: 
+@len: 
+@Returns: 
 
 
 
@@ -72,88 +59,100 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
 
-@filename: 
+@ssid1: 
+@ssid2: 
+@ignore_trailing_null: 
 @Returns: 
 
 
-
+
 
 
 
 
-@hash: 
+@ssid: 
 @Returns: 
 
 
-
+
 
 
 
 
-@asc: 
-@type: 
+@hash: 
 @Returns: 
 
 
-
+
 
 
 
 
-@asc: 
-@type: 
-@buffer: 
-@Returns: 
+@list: 
+@elem_destroy_fn: 
 
 
-
+
 
 
 
 
-@type: 
-@Returns: 
-
+@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: 
 
-
+
 
 
 
 
-@addr: 
 @type: 
+@wifi_caps: 
+@have_ap: 
+@adhoc: 
+@ap_flags: 
+@ap_wpa: 
+@ap_rsn: 
 @Returns: 
 
 
-
+
 
 
 
 
-@len: 
+@type: 
+@wifi_caps: 
 @Returns: 
 
 
-
+
 
 
 
 
-@name: 
+@key: 
+@wep_type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@error: 
+@psk: 
 @Returns: 
 
 
@@ -175,49 +174,49 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
 
-@ip: 
+@value: 
 @Returns: 
 
 
-
+
 
 
 
 
-@netmask: 
-@Returns: 
+@list: 
+@value: 
 
 
-
+
 
 
 
 
-@prefix: 
+@netmask: 
 @Returns: 
 
 
-
+
 
 
 
 
-@value: 
+@prefix: 
 @Returns: 
 
 
-
+
 
 
 
 
-@list: 
-@value: 
+@ip: 
+@Returns: 
 
 
 
@@ -238,7 +237,7 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
@@ -247,7 +246,7 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
@@ -256,7 +255,7 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
@@ -265,7 +264,7 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
@@ -274,22 +273,21 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
 
-@ssid: 
-@len: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@str: 
+@s: 
 @Returns: 
 
 
@@ -305,124 +303,126 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
 
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
+@filename: 
 @Returns: 
 
 
-
+
 
 
 
 
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
+@freq: 
 @Returns: 
 
 
-
+
 
 
 
 
-@list: 
-@elem_destroy_fn: 
+@channel: 
+@band: 
+@Returns: 
 
 
-
+
 
 
 
 
-@ssid: 
+@channel: 
+@direction: 
+@band: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@channel: 
+@band: 
 @Returns: 
 
 
-
+
 
 
 
 
-@s: 
+
+
+
+
+
+
+
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@key: 
-@wep_type: 
+@len: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@band: 
+@addr: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@direction: 
-@band: 
+@asc: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@freq: 
+@asc: 
+@type: 
+@buffer: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@band: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@psk: 
+@str: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 68f4aad3..fe98bd59 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.8.0
+0.9.8.8
-- 
cgit 1.3.0-6-gf8a5