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/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 +- 71 files changed, 6736 insertions(+), 5543 deletions(-) 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/libnm-glib') 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
-- 
cgit 1.3.0-6-gf8a5