From b436a68a20ff3114ded32a7a3d70cdd4954039f9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 12 Nov 2011 01:36:14 +0100 Subject: Imported Upstream version 0.9.2.0 --- docs/libnm-util/Makefile.in | 126 +- docs/libnm-util/html/NMConnection.html | 1087 ++++++------- docs/libnm-util/html/NMSetting.html | 915 ++++++----- docs/libnm-util/html/NMSetting8021x.html | 1684 ++++++++++---------- docs/libnm-util/html/NMSettingBluetooth.html | 134 +- docs/libnm-util/html/NMSettingCdma.html | 162 +- docs/libnm-util/html/NMSettingConnection.html | 355 ++--- docs/libnm-util/html/NMSettingGsm.html | 478 +++--- docs/libnm-util/html/NMSettingIP4Config.html | 1164 +++++++------- docs/libnm-util/html/NMSettingIP6Config.html | 1078 ++++++------- docs/libnm-util/html/NMSettingOlpcMesh.html | 125 +- docs/libnm-util/html/NMSettingPPP.html | 308 ++-- docs/libnm-util/html/NMSettingPPPOE.html | 174 +- docs/libnm-util/html/NMSettingSerial.html | 152 +- docs/libnm-util/html/NMSettingVPN.html | 394 +++-- docs/libnm-util/html/NMSettingWimax.html | 140 +- docs/libnm-util/html/NMSettingWired.html | 328 ++-- docs/libnm-util/html/NMSettingWireless.html | 452 +++--- .../libnm-util/html/NMSettingWirelessSecurity.html | 688 ++++---- docs/libnm-util/html/annotation-glossary.html | 4 +- docs/libnm-util/html/api-index-full.html | 275 +--- docs/libnm-util/html/ch01.html | 6 +- docs/libnm-util/html/index.html | 4 +- docs/libnm-util/html/index.sgml | 966 ++++++----- docs/libnm-util/html/libnm-util-nm-utils.html | 774 ++++----- docs/libnm-util/html/libnm-util.devhelp | 911 ----------- docs/libnm-util/html/libnm-util.devhelp2 | 938 +++++------ docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/libnm-util-sections.txt | 1490 ++++++++--------- docs/libnm-util/libnm-util.types | 40 + docs/libnm-util/tmpl/libnm-util-unused.sgml | 0 docs/libnm-util/tmpl/nm-connection.sgml | 470 ++++++ docs/libnm-util/tmpl/nm-setting-8021x.sgml | 1010 ++++++++++++ docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 132 ++ docs/libnm-util/tmpl/nm-setting-cdma.sgml | 160 ++ docs/libnm-util/tmpl/nm-setting-connection.sgml | 267 ++++ docs/libnm-util/tmpl/nm-setting-gsm.sgml | 339 ++++ docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 737 +++++++++ docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 681 ++++++++ docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 138 ++ docs/libnm-util/tmpl/nm-setting-ppp.sgml | 454 ++++++ docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 160 ++ docs/libnm-util/tmpl/nm-setting-private.sgml | 31 + docs/libnm-util/tmpl/nm-setting-serial.sgml | 181 +++ docs/libnm-util/tmpl/nm-setting-vpn.sgml | 229 +++ docs/libnm-util/tmpl/nm-setting-wimax.sgml | 113 ++ docs/libnm-util/tmpl/nm-setting-wired.sgml | 349 ++++ .../tmpl/nm-setting-wireless-security.sgml | 541 +++++++ docs/libnm-util/tmpl/nm-setting-wireless.sgml | 398 +++++ docs/libnm-util/tmpl/nm-setting.sgml | 323 ++++ docs/libnm-util/tmpl/nm-utils.sgml | 316 ++++ 51 files changed, 13838 insertions(+), 8547 deletions(-) delete mode 100644 docs/libnm-util/html/libnm-util.devhelp create mode 100644 docs/libnm-util/libnm-util.types create mode 100644 docs/libnm-util/tmpl/libnm-util-unused.sgml create mode 100644 docs/libnm-util/tmpl/nm-connection.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-8021x.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-bluetooth.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-cdma.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-connection.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-gsm.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-ip4-config.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-ppp.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-pppoe.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-private.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-serial.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-vpn.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-wimax.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-wired.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-wireless-security.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting-wireless.sgml create mode 100644 docs/libnm-util/tmpl/nm-setting.sgml create mode 100644 docs/libnm-util/tmpl/nm-utils.sgml (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 43d198aa..f35bd85e 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -122,6 +122,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ @@ -342,10 +344,10 @@ GTKDOC_LIBS = \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute @@ -363,11 +365,12 @@ SETUP_FILES = \ $(DOC_MODULE)-overrides.txt EXTRA_DIST = \ + $(HTML_IMAGES) \ $(SETUP_FILES) DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -593,36 +596,43 @@ $(REPORT_FILES): sgml-build.stamp setup-build.stamp: -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo 'gtk-doc: Preparing build'; \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - test -f $(abs_srcdir)/$$file && \ - cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \ - done \ - fi; \ - test -f $(abs_srcdir)/tmpl && \ - cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || 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 -setup.stamp: setup-build.stamp - @true - #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' + @echo ' DOC Scanning header files' @_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 \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi @touch scan-build.stamp @@ -632,8 +642,8 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### templates #### -tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' +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 \ if test -w $(abs_srcdir) ; then \ @@ -651,7 +661,7 @@ $(srcdir)/tmpl/*.sgml: #### xml #### sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ @@ -666,13 +676,19 @@ sgml.stamp: sgml-build.stamp #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' + @echo ' DOC Building HTML' @rm -rf html @mkdir html @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(abs_srcdir)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ @@ -684,49 +700,55 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo 'gtk-doc: Fixing cross-references' + @echo ' DOC Fixing cross-references' @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @rm -rf $(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ rm -rf tmpl; \ fi maintainer-clean-local: clean - rm -rf xml html + @rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -735,14 +757,12 @@ install-data-local: fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -764,15 +784,15 @@ uninstall-local: @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/html - -cp $(build)/tmpl/*.sgml $(distdir)/tmpl - cp $(builddir)/html/* $(distdir)/html - -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(build)/$(DOC_MODULE).types $(distdir)/ - -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 3eb0788a..19914db2 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -8,7 +8,7 @@ - + @@ -46,109 +46,96 @@ 
 #include <nm-connection.h>
 
-enum                NMConnectionError;
-#define             NM_TYPE_CONNECTION_ERROR
-#define             NM_CONNECTION_ERROR
-GQuark              nm_connection_error_quark           (void);
-#define             NM_CONNECTION_PATH
                     NMConnection;
                     NMConnectionClass;
-GType               nm_connection_get_type              (void);
-NMConnection *      nm_connection_new                   (void);
-NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);
-NMConnection *      nm_connection_duplicate             (NMConnection *connection);
-NMSetting *         nm_connection_create_setting        (const char *name);
+enum                NMConnectionError;
+#define             NM_CONNECTION_PATH
 void                nm_connection_add_setting           (NMConnection *connection,
                                                          NMSetting *setting);
-void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);
-gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);
+void                nm_connection_clear_secrets         (NMConnection *connection);
+void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
 gboolean            nm_connection_compare               (NMConnection *a,
                                                          NMConnection *b,
                                                          NMSettingCompareFlags flags);
+NMSetting *         nm_connection_create_setting        (const char *name);
 gboolean            nm_connection_diff                  (NMConnection *a,
                                                          NMConnection *b,
                                                          NMSettingCompareFlags flags,
                                                          GHashTable **out_settings);
-gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);
-const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);
-void                nm_connection_clear_secrets         (NMConnection *connection);
-void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
-gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);
-const char *        nm_connection_get_path              (NMConnection *connection);
-gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);
+void                nm_connection_dump                  (NMConnection *connection);
+NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+GQuark              nm_connection_error_quark           (void);
 void                nm_connection_for_each_setting_value
                                                         (NMConnection *connection,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
-GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);
-void                nm_connection_dump                  (NMConnection *connection);
-GType               nm_connection_lookup_setting_type   (const char *name);
-GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);
-const char *        nm_connection_get_uuid              (NMConnection *connection);
 const char *        nm_connection_get_id                (NMConnection *connection);
-NMSetting8021x *            nm_connection_get_setting_802_1x
-                                                        (NMConnection *connection);
-NMSettingBluetooth *        nm_connection_get_setting_bluetooth
-                                                        (NMConnection *connection);
-NMSettingCdma *             nm_connection_get_setting_cdma
-                                                        (NMConnection *connection);
-NMSettingConnection *       nm_connection_get_setting_connection
-                                                        (NMConnection *connection);
-NMSettingGsm *              nm_connection_get_setting_gsm
-                                                        (NMConnection *connection);
-NMSettingIP4Config *        nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);
-NMSettingIP6Config *        nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);
-NMSettingOlpcMesh *         nm_connection_get_setting_olpc_mesh
-                                                        (NMConnection *connection);
-NMSettingPPP *              nm_connection_get_setting_ppp
-                                                        (NMConnection *connection);
-NMSettingPPPOE *            nm_connection_get_setting_pppoe
-                                                        (NMConnection *connection);
-NMSettingVPN *              nm_connection_get_setting_vpn
+const char *        nm_connection_get_path              (NMConnection *connection);
+NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
+NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
-NMSettingWimax *            nm_connection_get_setting_wimax
+NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);
+NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
+NMSettingConnection * nm_connection_get_setting_connection
                                                         (NMConnection *connection);
-NMSettingWired *            nm_connection_get_setting_wired
+NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);
+NMSettingIP4Config * nm_connection_get_setting_ip4_config
                                                         (NMConnection *connection);
-NMSettingWireless *         nm_connection_get_setting_wireless
+NMSettingIP6Config * nm_connection_get_setting_ip6_config
                                                         (NMConnection *connection);
+NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);
+NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);
+NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);
+NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
+NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
+NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
+NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);
 NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
                                                         (NMConnection *connection);
+const char *        nm_connection_get_uuid              (NMConnection *connection);
+gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);
+GType               nm_connection_lookup_setting_type   (const char *name);
+GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);
+NMConnection *      nm_connection_new                   (void);
+NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);
+gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);
+void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);
+gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);
+gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);

Object Hierarchy

-
-  GEnum
-   +----NMConnectionError
-
   GObject
    +----NMConnection
+
+  GEnum
+   +----NMConnectionError
+

Properties

@@ -184,9 +171,30 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters

Details

-

enum NMConnectionError

-
typedef enum
-{
+
NMConnection

+
typedef struct _NMConnection NMConnection;

+

+The NMConnection struct contains only private data.
+It should only be accessed through the functions described below.
+

+
+
+
+

NMConnectionClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection, const char * setting);
+} NMConnectionClass;
+
+

+

+
+
+
+

enum NMConnectionError

+
typedef enum {
 	NM_CONNECTION_ERROR_UNKNOWN = 0,
 	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
 	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
@@ -230,138 +238,121 @@ Describes errors that may result from operations involving a 
 

 

-
NM_TYPE_CONNECTION_ERROR

-
#define NM_TYPE_CONNECTION_ERROR (nm_connection_error_get_type ()) 
-

-

-

-

-

-

-
NM_CONNECTION_ERROR

-
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+
NM_CONNECTION_PATH

+
#define NM_CONNECTION_PATH "path"
 

 

 

 

 

 

-
nm_connection_error_quark ()

-
GQuark              nm_connection_error_quark           (void);

+
nm_connection_add_setting ()

+
void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);

 

-Registers an error quark for NMConnection if necessary.
+Adds a NMSetting to the connection, replacing any previous NMSetting of the
+same name which has previously been added to the NMConnection.  The
+connection takes ownership of the NMSetting object and does not increase
+the setting object's reference count.
 

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

 

Returns :
the error quark used for NMConnection errors.
connection :
a NMConnection
+
setting :
the NMSetting to add to the connection object. [transfer full]
+

 

 

 

 

-
NM_CONNECTION_PATH

-
#define NM_CONNECTION_PATH "path"
-

-

-

-

-

-

-
NMConnection

-
typedef struct _NMConnection NMConnection;

-

-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMConnectionClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-

-

-

-

-

-

-
nm_connection_get_type ()

-
GType               nm_connection_get_type              (void);

-

-

-

-

-

-
nm_connection_new ()

-
NMConnection *      nm_connection_new                   (void);

+
nm_connection_clear_secrets ()

+
void                nm_connection_clear_secrets         (NMConnection *connection);

 

-Creates a new NMConnection object with no NMSetting objects.
+Clears and frees any secrets that may be stored in the connection, to avoid
+keeping secret data in memory when not needed.
 

 

-
-
+
+

 
 
Returns :
the new empty NMConnection object
connection :
the NMConnection
+
 

 

 

 

 

-
nm_connection_new_from_hash ()

-
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);

+
nm_connection_clear_secrets_with_flags ()

+
void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

 

-Creates a new NMConnection from a hash table describing the connection.  See
-nm_connection_to_hash() for a description of the expected hash table.
+Clears and frees secrets determined by func.
 

 

-
-
+
-
-
+
+
-
-
+
+

 
 
 
hash :
the GHashTable describing
-the connection. [element-type utf8 GLib.HashTable]
+
connection :
the NMConnection
 
 

 
error :
on unsuccessful return, an error
func :
function to be called to determine whether a
+specific secret should be cleared or not. [scope call]
+
 

 
Returns :
the new NMConnection object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validate
user_data :
caller-supplied data passed to func
+
 

 
 

 

 

 

-
nm_connection_duplicate ()

-
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

+
nm_connection_compare ()

+
gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);

 

-Duplicates a NMConnection.
+Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
+each flag's behavior.
 

 

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

 
 
 
connection :
the NMConnection to duplicate
a :
a NMConnection
+
 

 
Returns :
a new NMConnection containing the same settings and properties
-as the source NMConnection. [transfer full]
+
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 
Returns :

+TRUE if the comparison succeeds, FALSE if it does not

 
 

 

@@ -389,80 +380,88 @@ Create a new 
 

 

-
nm_connection_add_setting ()

-
void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);

+
nm_connection_diff ()

+
gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);

 

-Adds a NMSetting to the connection, replacing any previous NMSetting of the
-same name which has previously been added to the NMConnection.  The
-connection takes ownership of the NMSetting object and does not increase
-the setting object's reference count.
+Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
+each flag's behavior.  If the connections differ, settings and keys within
+each setting that differ are added to the returned out_settings hash table.
+No values are returned, only key names.
 

 

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

 
 
 
connection :
a :

 a NMConnection
 
 

 
setting :
the NMSetting to add to the connection object. [transfer full]
+
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
+
out_settings :
if the
+connections differ, on return a hash table mapping setting names to
+second-level GHashTable (utf8 to guint32), which contains the key names that
+differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
 
 
Returns :

+TRUE if the connections contain the same values, FALSE if they do
+not

 
 

 

 

 

-
nm_connection_remove_setting ()

-
void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_dump ()

+
void                nm_connection_dump                  (NMConnection *connection);

 

-Removes the NMSetting with the given GType from the NMConnection.  This
-operation dereferences the NMSetting object.
+Print the connection to stdout.  For debugging purposes ONLY, should NOT
+be used for serialization of the connection or machine-parsed in any way. The
+output format is not guaranteed to be stable and may change at any time.
 

 
-
-
+
-
-
-
-
-
-
-
+

 


 
connection :
a NMConnection
+the NMConnection
 
setting_type :
the GType of the setting object to remove

 

 

 

 

-
nm_connection_get_setting ()

-
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_duplicate ()

+
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

 

-Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.
+Duplicates a NMConnection.
 

 

-
-
-
-
-
+
-
@@ -470,198 +469,131 @@ added to the 
 

 

-
nm_connection_get_setting_by_name ()

-
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);

+
nm_connection_error_quark ()

+
GQuark              nm_connection_error_quark           (void);

 

-Gets the NMSetting with the given name, if one has been previously added
-the the NMConnection.
+Registers an error quark for NMConnection if necessary.
 

 

 
 
 

 
connection :
a NMConnection
-
setting_type :
the GType of the setting object to returnthe NMConnection to duplicate
 

 

 
Returns :
the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection. [transfer none]
+a new NMConnection containing the same settings and properties
+as the source NMConnection. [transfer full]
 
 

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

 

connection :
a NMConnection
-
name :
a setting name

 
Returns :
the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection. [transfer none]
-
the error quark used for NMConnection errors.

 

 

 

 

-
nm_connection_replace_settings ()

-
gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);

+
nm_connection_for_each_setting_value ()

+
void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);

+

+Iterates over the properties of each NMSetting object in the NMConnection,
+calling the supplied user function for each property.
+

 

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

 
 
 

 
connection :
a NMConnection
-
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
+the NMConnection
 
 

 
error :
location to store error, or NULL
+
func :
user-supplied function called for each setting's property. [scope call]
 
 

 
Returns :

-TRUE if the settings were valid and added to the connection, FALSE
-if they were not
user_data :
user data passed to func at each invocation
 

 
 

 

 

 

-
nm_connection_compare ()

-
gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);

+
nm_connection_get_id ()

+
const char *        nm_connection_get_id                (NMConnection *connection);

 

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.
+A shortcut to return the ID from the connection's NMSettingConnection.
 

 

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

 
 
 
a :
a NMConnection
-
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
+
connection :
the NMConnection
 
 

 

 
Returns :

-TRUE if the comparison succeeds, FALSE if it does notthe ID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_diff ()

-
gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);

+
nm_connection_get_path ()

+
const char *        nm_connection_get_path              (NMConnection *connection);

 

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned out_settings hash table.
-No values are returned, only key names.
+Returns the connection's D-Bus path.
 

 

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

 
 
 
a :
a NMConnection
-
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
out_settings :
if the
-connections differ, on return a hash table mapping setting names to
-second-level GHashTable (utf8 to guint32), which contains the key names that
-differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
+
connection :
the NMConnection
 
 

 

 
Returns :

-TRUE if the connections contain the same values, FALSE if they do
-notthe D-Bus path of the connection, previously set by a call to
+nm_connection_set_path().
 

 
 

 

 

 

-
nm_connection_verify ()

-
gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);

+
nm_connection_get_setting ()

+
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);

 

-Validates the connection and all its settings.  Each setting's properties
-have allowed values, and some values are dependent on other values.  For
-example, if a WiFi connection is security enabled, the NMSettingWireless
-setting object's 'security' property must contain the setting name of the
-NMSettingWirelessSecurity object, which must also be present in the 
-connection for the connection to be valid.  As another example, the
-NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
-setting and which property failed validation, and how it failed validation.
+Gets the NMSetting with the given GType, if one has been previously added
+to the NMConnection.
 

 

-
+
-
-
+
+
-
+

 
 
 

 
connection :
the NMConnection to verifya NMConnection
+
 

 
error :
location to store error, or NULL
-
setting_type :
the GType of the setting object to return
 

 

 
Returns :

-TRUE if the connection is valid, FALSE if it is notthe NMSetting, or NULL if no setting of that type was previously
+added to the NMConnection. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_need_secrets ()

-
const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);

+
nm_connection_get_setting_802_1x ()

+
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

 

-Returns the name of the first setting object in the connection which would
-need secrets to make a successful connection.  The returned hints are only
-intended as a guide to what secrets may be required, because in some
-circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
+A shortcut to return any NMSetting8021x the connection might contain.
 

 
@@ -672,66 +604,62 @@ secrets are needed.
 
-
-
-
-
-
+

 

 
 
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
-secrets of the NMSetting which may be required; the caller owns the array
-and must free the each array element with g_free(), as well as the array
-itself with g_ptr_array_free(). [out callee-allocates][element-type utf8][allow-none][transfer full]
-

 
Returns :
the setting name of the NMSetting object which has invalid or
-missing secretsan NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_clear_secrets ()

-
void                nm_connection_clear_secrets         (NMConnection *connection);

+
nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth * nm_connection_get_setting_bluetooth
+                                                        (NMConnection *connection);

 

-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
+A shortcut to return any NMSettingBluetooth the connection might contain.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
connection :

 the NMConnection
 
Returns :
an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
+

 

 

 

 

-
nm_connection_clear_secrets_with_flags ()

-
void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

+
nm_connection_get_setting_by_name ()

+
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);

 

-Clears and frees secrets determined by func.
+Gets the NMSetting with the given name, if one has been previously added
+the the NMConnection.
 

 

-
-
-
+
+
-
-
+
@@ -739,18 +667,10 @@ specific secret should be cleared or not. [
 

 

-
nm_connection_update_secrets ()

-
gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);

+
nm_connection_get_setting_cdma ()

+
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

 

-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).  Will also
-extract the given setting's secrets hash if given a hash of hashes, as would
-be returned from nm_connection_to_hash().  If setting_name is NULL, expects
-a fully serialized NMConnection as returned by nm_connection_to_hash() and
-will update all secrets from all settings contained in secrets.
+A shortcut to return any NMSettingCdma the connection might contain.
 

 

 
 
 

 
connection :
the NMConnection
+a NMConnection
 
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
-
name :
a setting name
 

 
user_data :
caller-supplied data passed to func
+
Returns :
the NMSetting, or NULL if no setting with that name was previously
+added to the NMConnection. [transfer none]
 
 

 
@@ -761,38 +681,20 @@ will update all secrets from all settings contained in 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 

setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
-
error :
location to store error, or NULL
-

 
Returns :

-TRUE if the secrets were successfully updated, FALSE if the update
-failed (tried to update secrets for a setting that doesn't exist, etc)an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_set_path ()

-
void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);

+
nm_connection_get_setting_connection ()

+
NMSettingConnection * nm_connection_get_setting_connection
+                                                        (NMConnection *connection);

 

-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the "path"
-property.
+A shortcut to return any NMSettingConnection the connection might contain.
 

 
@@ -803,19 +705,19 @@ property.
 
-
-
+
+

 

 
 
path :
the D-Bus path of the connection as given by the settings service
-which provides the connection
Returns :
an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_path ()

-
const char *        nm_connection_get_path              (NMConnection *connection);

+
nm_connection_get_setting_gsm ()

+
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

 

-Returns the connection's D-Bus path.
+A shortcut to return any NMSettingGsm the connection might contain.
 

 
@@ -827,21 +729,19 @@ Returns the connection's D-Bus path.
 
-
+

 

 

 
Returns :
the D-Bus path of the connection, previously set by a call to
-nm_connection_set_path().an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_is_type ()

-
gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);

+
nm_connection_get_setting_ip4_config ()

+
NMSettingIP4Config * nm_connection_get_setting_ip4_config
+                                                        (NMConnection *connection);

 

-A convenience function to check if the given connection is a particular
-type (ie wired, wifi, ppp, etc). Checks the "type"
-property of the connection and matches that against type.
+A shortcut to return any NMSettingIP4Config the connection might contain.
 

 
@@ -852,28 +752,20 @@ property of the connection and matches that against 
 
 
 
-
-
-
-
-
+

 

type :
a setting name to check the connection's type against (like
-NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
Returns :

-TRUE if the connection is of the given type, FALSE if notan NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_for_each_setting_value ()

-
void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);

+
nm_connection_get_setting_ip6_config ()

+
NMSettingIP6Config * nm_connection_get_setting_ip6_config
+                                                        (NMConnection *connection);

 

-Iterates over the properties of each NMSetting object in the NMConnection,
-calling the supplied user function for each property.
+A shortcut to return any NMSettingIP6Config the connection might contain.
 

 
@@ -884,29 +776,19 @@ calling the supplied user function for each property.
 
-
-
+
-
-
-
-

 

 
 
func :
user-supplied function called for each setting's property. [scope call]
+
Returns :
an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
 
 
user_data :
user data passed to func at each invocation

 
 

 

 

 

-
nm_connection_to_hash ()

-
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);

+
nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

 

-Converts the NMConnection into a GHashTable describing the connection,
-suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:GHashTable with each element in the returned hash representing
-a NMSetting object.  The keys are setting object names, and the values
-are GHashTables mapping string:GValue, each of which represents the
-properties of the NMSetting object.
+A shortcut to return any NMSettingOlpcMesh the connection might contain.
 

 
@@ -917,16 +799,8 @@ properties of the 
 
 
-
-
-
-
-
@@ -934,72 +808,79 @@ with 
-
nm_connection_dump ()

-
void                nm_connection_dump                  (NMConnection *connection);

+
nm_connection_get_setting_ppp ()

+
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

-Print the connection to stdout.  For debugging purposes ONLY, should NOT
-be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
+A shortcut to return any NMSettingPPP the connection might contain.
 

 

flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-

 
Returns :
a new
-GHashTable describing the connection, its settings, and each setting's
-properties.  The caller owns the hash table and must unref the hash table
-with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable]
+an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 
 
-
+
+
-
+
+
+
+
+
+

 


 
connection :

 the NMConnection
 
Returns :
an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
+

 

 

 

 

-
nm_connection_lookup_setting_type ()

-
GType               nm_connection_lookup_setting_type   (const char *name);

+
nm_connection_get_setting_pppoe ()

+
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

 

-Returns the GType of the setting's class for a given setting name.
+A shortcut to return any NMSettingPPOE the connection might contain.
 

 

-
-
+
+
-
+

 
 
 
name :
a setting name
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_lookup_setting_type_by_quark ()

-
GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);

+
nm_connection_get_setting_vpn ()

+
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

 

-Returns the GType of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
+A shortcut to return any NMSettingVPN the connection might contain.
 

 

-
-
+
+
-
+

 
 
 
error_quark :
a setting error quark
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_uuid ()

-
const char *        nm_connection_get_uuid              (NMConnection *connection);

+
nm_connection_get_setting_wimax ()

+
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

 

-A shortcut to return the UUID from the connection's NMSettingConnection.
+A shortcut to return any NMSettingWimax the connection might contain.
 

 
@@ -1011,17 +892,18 @@ A shortcut to return the UUID from the connection's Returns :

-
+

 

the UUID from the connection's 'connection' settingan NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_id ()

-
const char *        nm_connection_get_id                (NMConnection *connection);

+
nm_connection_get_setting_wired ()

+
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

 

-A shortcut to return the ID from the connection's NMSettingConnection.
+A shortcut to return any NMSettingWired the connection might contain.
 

 
@@ -1033,18 +915,18 @@ A shortcut to return the ID from the connection's Returns :

-
+

 

the ID from the connection's 'connection' settingan NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_setting_802_1x ()

-
NMSetting8021x *            nm_connection_get_setting_802_1x
-                                                        (NMConnection *connection);

+
nm_connection_get_setting_wireless ()

+
NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);

 

-A shortcut to return any NMSetting8021x the connection might contain.
+A shortcut to return any NMSettingWireless the connection might contain.
 

 
@@ -1056,7 +938,7 @@ A shortcut to return any Returns :

-
@@ -1064,11 +946,11 @@ A shortcut to return any 
-
nm_connection_get_setting_bluetooth ()

-
NMSettingBluetooth *        nm_connection_get_setting_bluetooth
+
nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingBluetooth the connection might contain.
+A shortcut to return any NMSettingWirelessSecurity the connection might contain.
 

 

 

an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
 
 

 
@@ -1080,7 +962,7 @@ A shortcut to return any Returns :

-
@@ -1088,11 +970,10 @@ A shortcut to return any 
-
nm_connection_get_setting_cdma ()

-
NMSettingCdma *             nm_connection_get_setting_cdma
-                                                        (NMConnection *connection);

+
nm_connection_get_uuid ()

+
const char *        nm_connection_get_uuid              (NMConnection *connection);

-A shortcut to return any NMSettingCdma the connection might contain.
+A shortcut to return the UUID from the connection's NMSettingConnection.
 

 

an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 
 
@@ -1104,19 +985,20 @@ A shortcut to return any Returns :

-
+

 

an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
-the UUID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_get_setting_connection ()

-
NMSettingConnection *       nm_connection_get_setting_connection
-                                                        (NMConnection *connection);

+
nm_connection_is_type ()

+
gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);

 

-A shortcut to return any NMSettingConnection the connection might contain.
+A convenience function to check if the given connection is a particular
+type (ie wired, wifi, ppp, etc). Checks the "type"
+property of the connection and matches that against type.
 

 
@@ -1127,68 +1009,73 @@ A shortcut to return any type :

+
+
+
-
+

 

a setting name to check the connection's type against (like
+NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
Returns :
an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
-
+TRUE if the connection is of the given type, FALSE if not
 

 
 

 

 

 

-
nm_connection_get_setting_gsm ()

-
NMSettingGsm *              nm_connection_get_setting_gsm
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type ()

+
GType               nm_connection_lookup_setting_type   (const char *name);

 

-A shortcut to return any NMSettingGsm the connection might contain.
+Returns the GType of the setting's class for a given setting name.
 

 

-
-
+
+
-
+

 
 
 
connection :
the NMConnection
-
name :
a setting name
 

 

 
Returns :
an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip4_config ()

-
NMSettingIP4Config *        nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type_by_quark ()

+
GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);

 

-A shortcut to return any NMSettingIP4Config the connection might contain.
+Returns the GType of the setting's class for a given setting error quark.
+Useful for figuring out which setting a returned error is for.
 

 

-
-
+
+
-
+

 
 
 
connection :
the NMConnection
-
error_quark :
a setting error quark
 

 

 
Returns :
an NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip6_config ()

-
NMSettingIP6Config *        nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);

+
nm_connection_need_secrets ()

+
const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);

 

-A shortcut to return any NMSettingIP6Config the connection might contain.
+Returns the name of the first setting object in the connection which would
+need secrets to make a successful connection.  The returned hints are only
+intended as a guide to what secrets may be required, because in some
+circumstances, there is no way to conclusively determine exactly which
+secrets are needed.
 

 
@@ -1199,116 +1086,134 @@ A shortcut to return any Returns :

-
+
+
+
+
+

 

an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
+
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
+secrets of the NMSetting which may be required; the caller owns the array
+and must free the each array element with g_free(), as well as the array
+itself with g_ptr_array_free(). [out callee-allocates][element-type utf8][allow-none][transfer full]
 
 
Returns :
the setting name of the NMSetting object which has invalid or
+missing secrets

 
 

 

 

 

-
nm_connection_get_setting_olpc_mesh ()

-
NMSettingOlpcMesh *         nm_connection_get_setting_olpc_mesh
-                                                        (NMConnection *connection);

+
nm_connection_new ()

+
NMConnection *      nm_connection_new                   (void);

 

-A shortcut to return any NMSettingOlpcMesh the connection might contain.
+Creates a new NMConnection object with no NMSetting objects.
 

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

 

connection :
the NMConnection
-

 
Returns :
an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
-
the new empty NMConnection object

 

 

 

 

-
nm_connection_get_setting_ppp ()

-
NMSettingPPP *              nm_connection_get_setting_ppp
-                                                        (NMConnection *connection);

+
nm_connection_new_from_hash ()

+
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);

 

-A shortcut to return any NMSettingPPP the connection might contain.
+Creates a new NMConnection from a hash table describing the connection.  See
+nm_connection_to_hash() for a description of the expected hash table.
 

 

-
-
+
+
+
+
+
-
+

 
 
 
connection :
the NMConnection
+
hash :
the GHashTable describing
+the connection. [element-type utf8 GLib.HashTable]
 
 

 
error :
on unsuccessful return, an error

 
Returns :
an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
-the new NMConnection object, populated with settings created
+from the values in the hash table, or NULL if the connection failed to
+validate
 

 
 

 

 

 

-
nm_connection_get_setting_pppoe ()

-
NMSettingPPPOE *            nm_connection_get_setting_pppoe
-                                                        (NMConnection *connection);

+
nm_connection_remove_setting ()

+
void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);

 

-A shortcut to return any NMSettingPPOE the connection might contain.
+Removes the NMSetting with the given GType from the NMConnection.  This
+operation dereferences the NMSetting object.
 

 

-
-
-
+
+

 
 
 

 
connection :
the NMConnection
+a NMConnection
 
 

 
Returns :
an NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
-
setting_type :
the GType of the setting object to remove
 

 
 

 

 

 

-
nm_connection_get_setting_vpn ()

-
NMSettingVPN *              nm_connection_get_setting_vpn
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingVPN the connection might contain.
-

+
nm_connection_replace_settings ()

+
gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);

 

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

 
 
 

 
connection :
the NMConnection
+a NMConnection
 
 

 
Returns :
an NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the settings were valid and added to the connection, FALSE
+if they were not

 
 

 

 

 

-
nm_connection_get_setting_wimax ()

-
NMSettingWimax *            nm_connection_get_setting_wimax
-                                                        (NMConnection *connection);

+
nm_connection_set_path ()

+
void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);

 

-A shortcut to return any NMSettingWimax the connection might contain.
+Sets the D-Bus path of the connection.  This property is not serialized, and
+is only for the reference of the caller.  Sets the "path"
+property.
 

 
@@ -1319,20 +1224,25 @@ A shortcut to return any Returns :

-
+
+

 

an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
-
path :
the D-Bus path of the connection as given by the settings service
+which provides the connection
 

 
 

 

 

 

-
nm_connection_get_setting_wired ()

-
NMSettingWired *            nm_connection_get_setting_wired
-                                                        (NMConnection *connection);

+
nm_connection_to_hash ()

+
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);

 

-A shortcut to return any NMSettingWired the connection might contain.
+Converts the NMConnection into a GHashTable describing the connection,
+suitable for marshalling over D-Bus or serializing.  The hash table mapping
+is string:GHashTable with each element in the returned hash representing
+a NMSetting object.  The keys are setting object names, and the values
+are GHashTables mapping string:GValue, each of which represents the
+properties of the NMSetting object.
 

 
@@ -1343,8 +1253,16 @@ A shortcut to return any flags :

+
+
+
-
@@ -1352,11 +1270,18 @@ A shortcut to return any 
-
nm_connection_get_setting_wireless ()

-
NMSettingWireless *         nm_connection_get_setting_wireless
-                                                        (NMConnection *connection);

+
nm_connection_update_secrets ()

+
gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);

-A shortcut to return any NMSettingWireless the connection might contain.
+Update the specified setting's secrets, given a hash table of secrets
+intended for that setting (deserialized from D-Bus for example).  Will also
+extract the given setting's secrets hash if given a hash of hashes, as would
+be returned from nm_connection_to_hash().  If setting_name is NULL, expects
+a fully serialized NMConnection as returned by nm_connection_to_hash() and
+will update all secrets from all settings contained in secrets.
 

 

hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
+

 
Returns :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+a new
+GHashTable describing the connection, its settings, and each setting's
+properties.  The caller owns the hash table and must unref the hash table
+with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable]
 
 

 
 
 
@@ -1367,33 +1292,61 @@ A shortcut to return any Returns :

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

 

an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
+
setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the secrets were successfully updated, FALSE if the update
+failed (tried to update secrets for a setting that doesn't exist, etc)

 
 

 

 

 

-
nm_connection_get_setting_wireless_security ()

-
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
-                                                        (NMConnection *connection);

+
nm_connection_verify ()

+
gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);

 

-A shortcut to return any NMSettingWirelessSecurity the connection might contain.
+Validates the connection and all its settings.  Each setting's properties
+have allowed values, and some values are dependent on other values.  For
+example, if a WiFi connection is security enabled, the NMSettingWireless
+setting object's 'security' property must contain the setting name of the
+NMSettingWirelessSecurity object, which must also be present in the 
+connection for the connection to be valid.  As another example, the
+NMSettingWired object's 'mac-address' property must be a validly formatted
+MAC address.  The returned GError contains information about which
+setting and which property failed validation, and how it failed validation.
 

 

-
+
+
+
+
-
+

 
 
 

 
connection :
the NMConnection
+the NMConnection to verify
error :
location to store error, or NULL
 
 

 

 
Returns :
an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
-
+TRUE if the connection is valid, FALSE if it is not
 

 
 

@@ -1468,6 +1421,6 @@ updated
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index eec15973..63319e1a 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -8,7 +8,7 @@ - + @@ -44,76 +44,69 @@ 
 #include <nm-setting.h>
 
-enum                NMSettingError;
-#define             NM_TYPE_SETTING_ERROR
-#define             NM_SETTING_ERROR
-GQuark              nm_setting_error_quark              (void);
-#define             NM_SETTING_PARAM_SERIALIZE
-#define             NM_SETTING_PARAM_REQUIRED
-#define             NM_SETTING_PARAM_SECRET
-#define             NM_SETTING_PARAM_FUZZY_IGNORE
-#define             NM_SETTING_NAME
-enum                NMSettingSecretFlags;
-enum                NMSettingCompareFlags;
                     NMSetting;
+                    NMSettingClass;
 gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
                                                          NMSettingSecretFlags flags,
                                                          gpointer user_data);
-                    NMSettingClass;
+enum                NMSettingCompareFlags;
+enum                NMSettingDiffResult;
+enum                NMSettingError;
+enum                NMSettingHashFlags;
+enum                NMSettingSecretFlags;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
                                                          const GValue *value,
                                                          GParamFlags flags,
                                                          gpointer user_data);
-GType               nm_setting_get_type                 (void);
-enum                NMSettingHashFlags;
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
-NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);
-NMSetting *         nm_setting_duplicate                (NMSetting *setting);
-const char *        nm_setting_get_name                 (NMSetting *setting);
-gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);
+#define             NM_SETTING_NAME
+#define             NM_SETTING_PARAM_FUZZY_IGNORE
+#define             NM_SETTING_PARAM_REQUIRED
+#define             NM_SETTING_PARAM_SECRET
+#define             NM_SETTING_PARAM_SERIALIZE
+void                nm_setting_clear_secrets            (NMSetting *setting);
+void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
 gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags);
-enum                NMSettingDiffResult;
 gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);
+NMSetting *         nm_setting_duplicate                (NMSetting *setting);
 void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
-char *              nm_setting_to_string                (NMSetting *setting);
-void                nm_setting_clear_secrets            (NMSetting *setting);
-void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
-GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
-gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);
+GQuark              nm_setting_error_quark              (void);
+const char *        nm_setting_get_name                 (NMSetting *setting);
 gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags *out_flags,
                                                          GError **error);
+GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
+NMSetting *         nm_setting_new_from_hash            (GType setting_type,
+                                                         GHashTable *hash);
 gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags flags,
                                                          GError **error);
+GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);
+char *              nm_setting_to_string                (NMSetting *setting);
+gboolean            nm_setting_update_secrets           (NMSetting *setting,
+                                                         GHashTable *secrets,
+                                                         GError **error);
+gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);

Object Hierarchy

-
-  GEnum
-   +----NMSettingError
-
   GObject
    +----NMSetting
@@ -134,6 +127,10 @@ enum                NMSettingWireless
          +----NMSettingWirelessSecurity
+
+  GEnum
+   +----NMSettingError
+

Properties

@@ -155,166 +152,95 @@ of properties and allowed values.

Details

-

enum NMSettingError

-
typedef enum
-{
-	NM_SETTING_ERROR_UNKNOWN = 0,
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
-} NMSettingError;
-
-

-Describes errors that may result from operations involving a NMSetting. -

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

NM_SETTING_ERROR_UNKNOWN

unknown or unclassified error -

NM_SETTING_ERROR_PROPERTY_NOT_FOUND

a property required by the operation - was not found; for example, an attempt to update an invalid secret -

NM_SETTING_ERROR_PROPERTY_NOT_SECRET

an operation which requires a secret - was attempted on a non-secret property -

NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH

the operation requires a property - of a specific type, or the value couldn't be transformed to the same type - as the property being acted upon -
-
-
-
-

NM_TYPE_SETTING_ERROR

-
#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ()) 
-
-

-

-
-
-
-

NM_SETTING_ERROR

-
#define NM_SETTING_ERROR nm_setting_error_quark ()
-
-

-

-
-
-
-

nm_setting_error_quark ()

-
GQuark              nm_setting_error_quark              (void);
-

-Registers an error quark for NMSetting if necessary. -

-
-- - - - -

Returns :

the error quark used for NMSetting errors.
-
-
-
-

NM_SETTING_PARAM_SERIALIZE

-
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
-
-

-

-
-
-
-

NM_SETTING_PARAM_REQUIRED

-
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
-
-

-

-
-
-
-

NM_SETTING_PARAM_SECRET

-
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
-
-

-

-
-
-
-

NM_SETTING_PARAM_FUZZY_IGNORE

-
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
-
+

NMSetting

+
typedef struct _NMSetting NMSetting;

+The NMSetting struct contains only private data. +It should only be accessed through the functions described below.

-

NM_SETTING_NAME

-
#define NM_SETTING_NAME "name"
+
NMSettingClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual functions */
+	gboolean    (*verify)            (NMSetting  *setting,
+	                                  GSList     *all_settings,
+	                                  GError     **error);
+
+	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
+
+	gboolean    (*update_one_secret) (NMSetting  *setting,
+	                                  const char *key,
+	                                  GValue     *value,
+	                                  GError    **error);
+
+	gboolean    (*get_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags *out_flags,
+	                                  GError **error);
+
+	gboolean    (*set_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags flags,
+	                                  GError **error);
+
+	/* Returns TRUE if the given property contains the same value in both settings */
+	gboolean    (*compare_property)  (NMSetting *setting,
+	                                  NMSetting *other,
+	                                  const GParamSpec *prop_spec,
+	                                  NMSettingCompareFlags flags);
+
+	void        (*clear_secrets_with_flags) (NMSetting *setting,
+	                                         GParamSpec *pspec,
+	                                         NMSettingClearSecretsWithFlagsFn func,
+	                                         gpointer user_data);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+} NMSettingClass;
-

enum NMSettingSecretFlags

-
typedef enum {
-	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
-	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
-	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
-	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
-
-	/* NOTE: if adding flags, update nm-setting-private.h as well */
-} NMSettingSecretFlags;
-
-

-These flags indicate specific behavior related to handling of a secret. Each -secret has a corresponding set of these flags which indicate how the secret -is to be stored and/or requested when it is needed. -

+

NMSettingClearSecretsWithFlagsFn ()

+
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                                         const char *secret,
+                                                         NMSettingSecretFlags flags,
+                                                         gpointer user_data);
- - + + - - + + - - + - - + + + + +

NM_SETTING_SECRET_FLAG_NONE

the system is responsible for providing and -storing this secret (default) -

setting :

The setting for which secrets are being iterated

NM_SETTING_SECRET_FLAG_AGENT_OWNED

a user secret agent is responsible -for providing and storing this secret; when it is required agents will be -asked to retrieve it -

secret :

The secret's name

NM_SETTING_SECRET_FLAG_NOT_SAVED

this secret should not be saved, but -should be requested from the user each time it is needed +

flags :

The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED

NM_SETTING_SECRET_FLAG_NOT_REQUIRED

in situations where it cannot be -automatically determined that the secret is required (some VPNs and PPP -providers dont require all secrets) this flag indicates that the specific -secret is not required +

user_data :

User data passed to nm_connection_clear_secrets_with_flags()

Returns :

 +TRUE to clear the secret, FALSE to not clear the secret
@@ -378,131 +304,75 @@ storage (ie, the secret's flag includes NM_SETTING_S
-

NMSetting

-
typedef struct _NMSetting NMSetting;
+

enum NMSettingDiffResult

+
typedef enum {
+	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
+	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
+	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
+} NMSettingDiffResult;
+

-The NMSetting struct contains only private data. -It should only be accessed through the functions described below. +These values indicate the result of a setting difference operation.

-
-
-
-

NMSettingClearSecretsWithFlagsFn ()

-
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
-                                                         const char *secret,
-                                                         NMSettingSecretFlags flags,
-                                                         gpointer user_data);
- - - - - - - - - - + - - + - - + +

setting :

The setting for which secrets are being iterated

secret :

The secret's name

flags :

The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED +

NM_SETTING_DIFF_RESULT_UNKNOWN

unknown result

user_data :

User data passed to nm_connection_clear_secrets_with_flags() +

NM_SETTING_DIFF_RESULT_IN_A

the property is present in setting A

Returns :

 -TRUE to clear the secret, FALSE to not clear the secret

NM_SETTING_DIFF_RESULT_IN_B

the property is present in setting B +
-

NMSettingClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual functions */
-	gboolean    (*verify)            (NMSetting  *setting,
-	                                  GSList     *all_settings,
-	                                  GError     **error);
-
-	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
-
-	gboolean    (*update_one_secret) (NMSetting  *setting,
-	                                  const char *key,
-	                                  GValue     *value,
-	                                  GError    **error);
-
-	gboolean    (*get_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags *out_flags,
-	                                  GError **error);
-
-	gboolean    (*set_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags flags,
-	                                  GError **error);
-
-	/* Returns TRUE if the given property contains the same value in both settings */
-	gboolean    (*compare_property)  (NMSetting *setting,
-	                                  NMSetting *other,
-	                                  const GParamSpec *prop_spec,
-	                                  NMSettingCompareFlags flags);
-
-	void        (*clear_secrets_with_flags) (NMSetting *setting,
-	                                         GParamSpec *pspec,
-	                                         NMSettingClearSecretsWithFlagsFn func,
-	                                         gpointer user_data);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-} NMSettingClass;
+
enum NMSettingError

+
typedef enum {
+	NM_SETTING_ERROR_UNKNOWN = 0,
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
+} NMSettingError;
 

 

+Describes errors that may result from operations involving a NMSetting.
 

-
-
-
-

NMSettingValueIterFn ()

-
void                (*NMSettingValueIterFn)             (NMSetting *setting,
-                                                         const char *key,
-                                                         const GValue *value,
-                                                         GParamFlags flags,
-                                                         gpointer user_data);
- - + - - - - - - + + - - + - - + @@ -510,13 +380,6 @@ It should only be accessed through the functions described below.
-

nm_setting_get_type ()

-
GType               nm_setting_get_type                 (void);
-

-

-
-
-

enum NMSettingHashFlags

typedef enum {
 	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
@@ -551,31 +414,49 @@ when calling 
-
nm_setting_to_hash ()

-
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);

+
enum NMSettingSecretFlags

+
typedef enum {
+	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
+	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
+	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
+	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
+
+	/* NOTE: if adding flags, update nm-setting-private.h as well */
+} NMSettingSecretFlags;
+

 

-Converts the NMSetting into a GHashTable mapping each setting property
-name to a GValue describing that property, suitable for marshalling over
-D-Bus or serializing.  The mapping is string to GValue.
+These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.

setting :

The setting for which properties are being iterated, given to -nm_setting_enumerate_values() +

NM_SETTING_ERROR_UNKNOWN

unknown or unclassified error

key :

The value/property name

value :

The property's value

NM_SETTING_ERROR_PROPERTY_NOT_FOUND

a property required by the operation + was not found; for example, an attempt to update an invalid secret +

flags :

The property's flags, like NM_SETTING_PARAM_SECRET +

NM_SETTING_ERROR_PROPERTY_NOT_SECRET

an operation which requires a secret + was attempted on a non-secret property

user_data :

User data passed to nm_setting_enumerate_values() +

NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH

the operation requires a property + of a specific type, or the value couldn't be transformed to the same type + as the property being acted upon
- - + - - + - - + + + + + @@ -583,118 +464,127 @@ describing the setting's properties. [ -

nm_setting_new_from_hash ()

-
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);
-

-Creates a new NMSetting object and populates that object with the properties -contained in the hash table, using each hash key as the property to set, -and each hash value as the value to set that property to. Setting properties -are strongly typed, thus the GValue type of the hash value must be correct. -See the documentation on each NMSetting object subclass for the correct -property names and value types. -

+

NMSettingValueIterFn ()

+
void                (*NMSettingValueIterFn)             (NMSetting *setting,
+                                                         const char *key,
+                                                         const GValue *value,
+                                                         GParamFlags flags,
+                                                         gpointer user_data);

setting :

the NMSetting +

NM_SETTING_SECRET_FLAG_NONE

the system is responsible for providing and +storing this secret (default)

flags :

hash flags, e.g. NM_SETTING_HASH_FLAG_ALL +

NM_SETTING_SECRET_FLAG_AGENT_OWNED

a user secret agent is responsible +for providing and storing this secret; when it is required agents will be +asked to retrieve it

Returns :

a new GHashTable -describing the setting's properties. [transfer full][element-type utf8 GObject.Value] +

NM_SETTING_SECRET_FLAG_NOT_SAVED

this secret should not be saved, but +should be requested from the user each time it is needed +

NM_SETTING_SECRET_FLAG_NOT_REQUIRED

in situations where it cannot be +automatically determined that the secret is required (some VPNs and PPP +providers dont require all secrets) this flag indicates that the specific +secret is not required
- - + + - - + + + + + + + + + - - + +

setting_type :

the NMSetting type which the hash contains properties for

setting :

The setting for which properties are being iterated, given to +nm_setting_enumerate_values() +

hash :

the GHashTable containing a -string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value] +

key :

The value/property name

value :

The property's value

flags :

The property's flags, like NM_SETTING_PARAM_SECRET

Returns :

a new NMSetting object populated with the properties from the -hash table, or NULL on failure

user_data :

User data passed to nm_setting_enumerate_values() +
-

nm_setting_duplicate ()

-
NMSetting *         nm_setting_duplicate                (NMSetting *setting);
+

NM_SETTING_NAME

+
#define NM_SETTING_NAME "name"
+

-Duplicates a NMSetting.

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

setting :

the NMSetting to duplicate

Returns :

a new NMSetting containing the same properties and values as the -source NMSetting. [transfer full] -
-

nm_setting_get_name ()

-
const char *        nm_setting_get_name                 (NMSetting *setting);
+

NM_SETTING_PARAM_FUZZY_IGNORE

+
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+

-Returns the type name of the NMSetting object +

+
+
+
+

NM_SETTING_PARAM_REQUIRED

+
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
+
+

+

+
+
+
+

NM_SETTING_PARAM_SECRET

+
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
+
+

+

+
+
+
+

NM_SETTING_PARAM_SERIALIZE

+
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
+
+

+

+
+
+
+

nm_setting_clear_secrets ()

+
void                nm_setting_clear_secrets            (NMSetting *setting);
+

+Resets and clears any secrets in the setting. Secrets should be added to the +setting only when needed, and cleared immediately after use to prevent +leakage of information.

- - + - - - - - - +

setting :

 the NMSetting

Returns :

a string containing the type name of the NMSetting object, -like 'ppp' or 'wireless' or 'wired'.
-

nm_setting_verify ()

-
gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);
+

nm_setting_clear_secrets_with_flags ()

+
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

-Validates the setting. Each setting's properties have allowed values, and -some are dependent on other values (hence the need for all_settings). The -returned GError contains information about which property of the setting -failed validation, and in what way that property failed validation. +Clears and frees secrets determined by func.

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

setting :

the NMSetting to verify

all_settings :

a GSList of all settings -in the connection from which setting came. [element-type NMSetting] +the NMSetting

error :

location to store error, or NULL +

func :

function to be called to determine whether a +specific secret should be cleared or not. [scope call]

Returns :

 -TRUE if the setting is valid, FALSE if it is not

user_data :

caller-supplied data passed to func +
@@ -737,39 +627,6 @@ for a description of each flag's behavior.
-

enum NMSettingDiffResult

-
typedef enum {
-	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
-	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
-	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
-} NMSettingDiffResult;
-
-

-These values indicate the result of a setting difference operation. -

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

NM_SETTING_DIFF_RESULT_UNKNOWN

unknown result -

NM_SETTING_DIFF_RESULT_IN_A

the property is present in setting A -

NM_SETTING_DIFF_RESULT_IN_B

the property is present in setting B -
-
-
-

nm_setting_diff ()

gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
@@ -806,18 +663,41 @@ one or more FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
 
 
-
results :

-if the
-settings differ, on return a hash table mapping the differing keys to one or
-more NMSettingDiffResult values OR-ed together.  If the settings do not
-differ, any hash table passed in is unmodified.  If no hash table is passed
-in and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]
-
+
results :

+if the
+settings differ, on return a hash table mapping the differing keys to one or
+more NMSettingDiffResult values OR-ed together.  If the settings do not
+differ, any hash table passed in is unmodified.  If no hash table is passed
+in and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]
+
+
+
+
Returns :

+
+TRUE if the settings contain the same values, FALSE if they do not
+
+
+
+
+
+
+

nm_setting_duplicate ()

+
NMSetting *         nm_setting_duplicate                (NMSetting *setting);
+

+Duplicates a NMSetting. +

+
++ + + + - +

setting :

the NMSetting to duplicate

Returns :

 -TRUE if the settings contain the same values, FALSE if they do nota new NMSetting containing the same properties and values as the +source NMSetting. [transfer full] +
@@ -854,57 +734,52 @@ user function for each property.
-

nm_setting_to_string ()

-
char *              nm_setting_to_string                (NMSetting *setting);
+

nm_setting_error_quark ()

+
GQuark              nm_setting_error_quark              (void);

-Convert the setting into a string. For debugging purposes ONLY, should NOT -be used for serialization of the setting, or machine-parsed in any way. The -output format is not guaranteed to be stable and may change at any time. +Registers an error quark for NMSetting if necessary.

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

setting :

the NMSetting -

Returns :

an allocated string containing a textual representation of the -setting's properties and values (including secrets!), which the caller should -free with g_free() -
the error quark used for NMSetting errors.
-

nm_setting_clear_secrets ()

-
void                nm_setting_clear_secrets            (NMSetting *setting);
+

nm_setting_get_name ()

+
const char *        nm_setting_get_name                 (NMSetting *setting);

-Resets and clears any secrets in the setting. Secrets should be added to the -setting only when needed, and cleared immediately after use to prevent -leakage of information. +Returns the type name of the NMSetting object

- + + - + + + + + +

setting :

 the NMSetting

Returns :

a string containing the type name of the NMSetting object, +like 'ppp' or 'wireless' or 'wired'.
-

nm_setting_clear_secrets_with_flags ()

-
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
+

nm_setting_get_secret_flags ()

+
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags,
+                                                         GError **error);

-Clears and frees secrets determined by func. +For a given secret, retrieves the NMSettingSecretFlags describing how to +handle that secret.

@@ -915,16 +790,23 @@ Clears and frees secrets determined by func - - + + - - + + + + + + + + +

func :

function to be called to determine whether a -specific secret should be cleared or not. [scope call] -

secret_name :

the secret key name to get flags for

user_data :

caller-supplied data passed to func +

out_flags :

on success, the NMSettingSecretFlags for the secret

error :

location to store error, or NULL

Returns :

TRUE on success (if the given secret name was a valid property of +this setting, and if that property is secret), FALSE if not
@@ -959,48 +841,44 @@ itself with -

nm_setting_update_secrets ()

-
gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);
+

nm_setting_new_from_hash ()

+
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
+                                                         GHashTable *hash);

-Update the setting's secrets, given a hash table of secrets intended for that -setting (deserialized from D-Bus for example). +Creates a new NMSetting object and populates that object with the properties +contained in the hash table, using each hash key as the property to set, +and each hash value as the value to set that property to. Setting properties +are strongly typed, thus the GValue type of the hash value must be correct. +See the documentation on each NMSetting object subclass for the correct +property names and value types.

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

setting :

the NMSetting -

secrets :

a GHashTable mapping -string to GValue of setting property names and secrets. [element-type utf8 GObject.Value] -

setting_type :

the NMSetting type which the hash contains properties for

error :

location to store error, or NULL +

hash :

the GHashTable containing a +string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]

Returns :

 -TRUE if the secrets were successfully updated and the connection -is valid, FALSE on failure or if the setting was never added to the connectiona new NMSetting object populated with the properties from the +hash table, or NULL on failure
-

nm_setting_get_secret_flags ()

-
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
+
nm_setting_set_secret_flags ()

+
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
+                                                         NMSettingSecretFlags flags,
                                                          GError **error);

 

 For a given secret, retrieves the NMSettingSecretFlags describing how to
@@ -1016,11 +894,11 @@ handle that secret.
 
 
 
secret_name :

-the secret key name to get flags for
+the secret key name to set flags for
 
 
-
out_flags :

-on success, the NMSettingSecretFlags for the secret
+
flags :

+the NMSettingSecretFlags for the secret
 
 
 
error :

@@ -1037,14 +915,72 @@ this setting, and if that property is secret), FALSE if not
-

nm_setting_set_secret_flags ()

-
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+
nm_setting_to_hash ()

+
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);

+

+Converts the NMSetting into a GHashTable mapping each setting property
+name to a GValue describing that property, suitable for marshalling over
+D-Bus or serializing.  The mapping is string to GValue.
+

+

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


setting :
the NMSetting
+
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
+
Returns :
a new GHashTable
+describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
+

+
+
+
+

nm_setting_to_string ()

+
char *              nm_setting_to_string                (NMSetting *setting);
+

+Convert the setting into a string. For debugging purposes ONLY, should NOT +be used for serialization of the setting, or machine-parsed in any way. The +output format is not guaranteed to be stable and may change at any time. +

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

setting :

the NMSetting +

Returns :

an allocated string containing a textual representation of the +setting's properties and values (including secrets!), which the caller should +free with g_free() +
+
+
+
+

nm_setting_update_secrets ()

+
gboolean            nm_setting_update_secrets           (NMSetting *setting,
+                                                         GHashTable *secrets,
                                                          GError **error);

-For a given secret, retrieves the NMSettingSecretFlags describing how to -handle that secret. +Update the setting's secrets, given a hash table of secrets intended for that +setting (deserialized from D-Bus for example).

@@ -1055,12 +991,49 @@ handle that secret. - - + + - - + + + + + + + + +

secret_name :

the secret key name to set flags for

secrets :

a GHashTable mapping +string to GValue of setting property names and secrets. [element-type utf8 GObject.Value] +

flags :

the NMSettingSecretFlags for the secret

error :

location to store error, or NULL +

Returns :

 +TRUE if the secrets were successfully updated and the connection +is valid, FALSE on failure or if the setting was never added to the connection
+
+
+
+

nm_setting_verify ()

+
gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);
+

+Validates the setting. Each setting's properties have allowed values, and +some are dependent on other values (hence the need for all_settings). The +returned GError contains information about which property of the setting +failed validation, and in what way that property failed validation. +

+
++ + + + + + + + @@ -1069,8 +1042,8 @@ handle that secret. - +

setting :

the NMSetting to verify

all_settings :

a GSList of all settings +in the connection from which setting came. [element-type NMSetting] +

error :

Returns :

TRUE on success (if the given secret name was a valid property of -this setting, and if that property is secret), FALSE if not +TRUE if the setting is valid, FALSE if it is not
@@ -1092,6 +1065,6 @@ example 'ppp' or 'wireless' or 'wired'.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index 1d7216b1..1318a65c 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -8,7 +8,7 @@ - + @@ -44,202 +44,197 @@ 
 #include <nm-setting-8021x.h>
 
+                    NMSetting8021x;
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
-#define             NM_SETTING_802_1X_SETTING_NAME
-enum                NMSetting8021xError;
-#define             NM_TYPE_SETTING_802_1X_ERROR
-#define             NM_SETTING_802_1X_ERROR
-GQuark              nm_setting_802_1x_error_quark       (void);
-#define             NM_SETTING_802_1X_EAP
-#define             NM_SETTING_802_1X_IDENTITY
+                    NMSetting8021xClass;
+enum                NMSetting8021xError;
+#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_ANONYMOUS_IDENTITY
 #define             NM_SETTING_802_1X_CA_CERT
 #define             NM_SETTING_802_1X_CA_PATH
-#define             NM_SETTING_802_1X_SUBJECT_MATCH
-#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_CLIENT_CERT
-#define             NM_SETTING_802_1X_PHASE1_PEAPVER
-#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
+#define             NM_SETTING_802_1X_EAP
+#define             NM_SETTING_802_1X_IDENTITY
+#define             NM_SETTING_802_1X_PASSWORD
+#define             NM_SETTING_802_1X_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
+#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
+#define             NM_SETTING_802_1X_PHASE1_PEAPVER
+#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_PHASE2_AUTH
 #define             NM_SETTING_802_1X_PHASE2_AUTHEAP
 #define             NM_SETTING_802_1X_PHASE2_CA_CERT
 #define             NM_SETTING_802_1X_PHASE2_CA_PATH
-#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
-#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
-#define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PRIVATE_KEY
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
+#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_PIN
 #define             NM_SETTING_802_1X_PIN_FLAGS
+#define             NM_SETTING_802_1X_PRIVATE_KEY
+#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
+#define             NM_SETTING_802_1X_SETTING_NAME
+#define             NM_SETTING_802_1X_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
-                    NMSetting8021x;
-                    NMSetting8021xClass;
-GType               nm_setting_802_1x_get_type          (void);
-NMSetting *         nm_setting_802_1x_new               (void);
-guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);
 gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);
-void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);
+void                nm_setting_802_1x_clear_altsubject_matches
+                                                        (NMSetting8021x *setting);
 void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
+void                nm_setting_802_1x_clear_phase2_altsubject_matches
+                                                        (NMSetting8021x *setting);
+GQuark              nm_setting_802_1x_error_quark       (void);
+const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
 const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_get_system_ca_certs
+const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_path
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_ca_cert_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_altsubject_matches
+NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);
-void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
+const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
                                                          guint32 i);
-void                nm_setting_802_1x_clear_altsubject_matches
+const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
+guint32             nm_setting_802_1x_get_num_altsubject_matches
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
+guint32             nm_setting_802_1x_get_num_eap_methods
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_client_cert_path
+const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_phase1_peapver
+const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
 const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
+const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_ca_path
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+                                                        (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_private_key_path
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
 const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
+const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_altsubject_match
+NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_private_key_password
+                                                        (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_private_key_path
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_get_system_ca_certs
+                                                        (NMSetting8021x *setting);
+NMSetting *         nm_setting_802_1x_new               (void);
+void                nm_setting_802_1x_remove_altsubject_match
                                                         (NMSetting8021x *setting,
                                                          guint32 i);
-gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);
+void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
+                                                         guint32 i);
 void                nm_setting_802_1x_remove_phase2_altsubject_match
                                                         (NMSetting8021x *setting,
                                                          guint32 i);
-void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
 gboolean            nm_setting_802_1x_set_phase2_client_cert
                                                         (NMSetting8021x *setting,
                                                          const char *cert_path,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_private_key_blob
-                                                        (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_private_key_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+gboolean            nm_setting_802_1x_set_phase2_private_key
+                                                        (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);
-const char *            nm_setting_802_1x_get_phase2_private_key_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_private_key
-                                                        (NMSetting8021x *setting,
+gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
                                                          const char *key_path,
                                                          const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-const char *            nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);

Object Hierarchy

-
-  GEnum
-   +----NMSetting8021xError
-
   GObject
    +----NMSetting
          +----NMSetting8021x
+
+  GEnum
+   +----NMSetting8021xError
+

Properties

@@ -307,6 +302,13 @@ following books.

Details

+

NMSetting8021x

+
typedef struct _NMSetting8021x NMSetting8021x;
+

+

+
+
+

enum NMSetting8021xCKFormat

typedef enum {
 	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
@@ -387,15 +389,23 @@ to a file containing the certificate or key data
-

NM_SETTING_802_1X_SETTING_NAME

-
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
+
NMSetting8021xClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSetting8021xClass;
-

enum NMSetting8021xError

+

enum NMSetting8021xError

typedef enum {
 	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,
 	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
@@ -426,95 +436,88 @@ required
-

NM_TYPE_SETTING_802_1X_ERROR

-
#define NM_TYPE_SETTING_802_1X_ERROR (nm_setting_802_1x_error_get_type ()) 
+
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
-

NM_SETTING_802_1X_ERROR

-
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

+
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
-

nm_setting_802_1x_error_quark ()

-
GQuark              nm_setting_802_1x_error_quark       (void);
+

NM_SETTING_802_1X_CA_CERT

+
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
+

-Registers an error quark for NMSetting8021x if necessary.

-
-- - - - -

Returns :

the error quark used for NMSetting8021x errors.
-

NM_SETTING_802_1X_EAP

-
#define NM_SETTING_802_1X_EAP "eap"
+
NM_SETTING_802_1X_CA_PATH

+
#define NM_SETTING_802_1X_CA_PATH "ca-path"
-

NM_SETTING_802_1X_IDENTITY

-
#define NM_SETTING_802_1X_IDENTITY "identity"
+
NM_SETTING_802_1X_CLIENT_CERT

+
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
-

NM_SETTING_802_1X_ANONYMOUS_IDENTITY

-
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
+
NM_SETTING_802_1X_EAP

+
#define NM_SETTING_802_1X_EAP "eap"
-

NM_SETTING_802_1X_CA_CERT

-
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
+
NM_SETTING_802_1X_IDENTITY

+
#define NM_SETTING_802_1X_IDENTITY "identity"
-

NM_SETTING_802_1X_CA_PATH

-
#define NM_SETTING_802_1X_CA_PATH "ca-path"
+
NM_SETTING_802_1X_PASSWORD

+
#define NM_SETTING_802_1X_PASSWORD "password"
-

NM_SETTING_802_1X_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
+
NM_SETTING_802_1X_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
-

NM_SETTING_802_1X_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
+
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

+
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
-

NM_SETTING_802_1X_CLIENT_CERT

-
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
+
NM_SETTING_802_1X_PHASE1_PEAPLABEL

+
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

 

 

@@ -529,24 +532,16 @@ Registers an error quark for 
-
NM_SETTING_802_1X_PHASE1_PEAPLABEL

-
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
+
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
-

NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

-
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
-
-

-

-
-
-
-

NM_SETTING_802_1X_PHASE2_AUTH

-
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
+
NM_SETTING_802_1X_PHASE2_AUTH

+
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

 

 

@@ -577,22 +572,6 @@ Registers an error quark for 
-
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
-

-

-

-
-
-
-

NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
-
-

-

-
-
-

NM_SETTING_802_1X_PHASE2_CLIENT_CERT

#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
@@ -601,148 +580,110 @@ Registers an error quark for -

NM_SETTING_802_1X_PASSWORD

-
#define NM_SETTING_802_1X_PASSWORD "password"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
-

NM_SETTING_802_1X_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
-

NM_SETTING_802_1X_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
-

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
+
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
-

NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+
NM_SETTING_802_1X_PIN

+
#define NM_SETTING_802_1X_PIN "pin"
-

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
+
NM_SETTING_802_1X_PIN_FLAGS

+
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
-

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
+
NM_SETTING_802_1X_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
-

NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
-

NM_SETTING_802_1X_PIN

-
#define NM_SETTING_802_1X_PIN "pin"
+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
-

NM_SETTING_802_1X_PIN_FLAGS

-
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+
NM_SETTING_802_1X_SETTING_NAME

+
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
-

NM_SETTING_802_1X_SYSTEM_CA_CERTS

-
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
+
NM_SETTING_802_1X_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
-

NMSetting8021x

-
typedef struct _NMSetting8021x NMSetting8021x;
-

-

-
-
-
-

NMSetting8021xClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSetting8021xClass;
+
NM_SETTING_802_1X_SYSTEM_CA_CERTS

+
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
-

nm_setting_802_1x_get_type ()

-
GType               nm_setting_802_1x_get_type          (void);
-

-

-
-
-
-

nm_setting_802_1x_new ()

-
NMSetting *         nm_setting_802_1x_new               (void);
-

-Creates a new NMSetting8021x object with default values. -

-
-- - - - -

Returns :

the new empty NMSetting8021x object
-
-
-
-

nm_setting_802_1x_get_num_eap_methods ()

-
guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_add_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);

-Returns the number of eap methods allowed for use when connecting to the -network. Generally only one EAP method is used. Use the functions -nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(), -and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving -allowed EAP methods. +Adds an allowed alternate subject name match. Until at least one +match is added, the altSubjectName of the remote authentication +server is not verified.

@@ -753,19 +694,26 @@ allowed EAP methods. + + + + - +

altsubject_match :

the altSubjectName to allow for this connection

Returns :

the number of allowed EAP methodsTRUE if the alternative subject name match was +successfully added, FALSE if it was already allowed.
-

nm_setting_802_1x_get_eap_method ()

-
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);
+

nm_setting_802_1x_add_eap_method ()

+
gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
+                                                         const char *eap);

-Returns the name of the allowed EAP method at index i. +Adds an allowed EAP method. The setting is not valid until at least one +EAP method has been added. See "eap" property for a list of +allowed EAP methods.

@@ -776,26 +724,27 @@ Returns the name of the allowed EAP method at index - - + + - +

i :

the index of the EAP method name to return

eap :

the name of the EAP method to allow for this connection

Returns :

the name of the allowed EAP method at index i -TRUE if the EAP method was successfully added, FALSE if it was +not a valid method or if it was already allowed.
-

nm_setting_802_1x_add_eap_method ()

-
gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
-                                                         const char *eap);
+

nm_setting_802_1x_add_phase2_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);

-Adds an allowed EAP method. The setting is not valid until at least one -EAP method has been added. See "eap" property for a list of -allowed EAP methods. +Adds an allowed alternate subject name match for "phase 2". Until +at least one match is added, the altSubjectName of the "phase 2" +remote authentication server is not verified.

@@ -806,38 +755,33 @@ allowed EAP methods. - - + + - +

eap :

the name of the EAP method to allow for this connection

phase2_altsubject_match :

the "phase 2" altSubjectName to allow for this +connection

Returns :

TRUE if the EAP method was successfully added, FALSE if it was -not a valid method or if it was already allowed.TRUE if the "phase 2" alternative subject name match was +successfully added, FALSE if it was already allowed.
-

nm_setting_802_1x_remove_eap_method ()

-
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);
+

nm_setting_802_1x_clear_altsubject_matches ()

+
void                nm_setting_802_1x_clear_altsubject_matches
+                                                        (NMSetting8021x *setting);

-Removes the allowed EAP method at the specified index. +Clears all altSubjectName matches.

- - + - - - - - - +

setting :

 the NMSetting8021x

i :

the index of the EAP method to remove
@@ -858,23 +802,61 @@ Clears all allowed EAP methods.
-

nm_setting_802_1x_get_identity ()

-
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
+

nm_setting_802_1x_clear_phase2_altsubject_matches ()

+
void                nm_setting_802_1x_clear_phase2_altsubject_matches
+                                                        (NMSetting8021x *setting);

-Returns the identifier used by some EAP methods (like TLS) to -authenticate the user. Often this is a username or login name. +Clears all "phase 2" altSubjectName matches. +

+
++ + + + +

setting :

the NMSetting8021x +
+
+
+
+

nm_setting_802_1x_error_quark ()

+
GQuark              nm_setting_802_1x_error_quark       (void);
+

+Registers an error quark for NMSetting8021x if necessary. +

+
++ + + + +

Returns :

the error quark used for NMSetting8021x errors.
+
+
+
+

nm_setting_802_1x_get_altsubject_match ()

+
const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+

+Returns the altSubjectName match at index i.

- + + + + - +

setting :

the NMSetting8021x +the NMSettingConnection

i :

the zero-based index of the array of altSubjectName matches

Returns :

the user identifierthe altSubjectName match at index i +
@@ -907,16 +889,15 @@ a secure form, if applicable for that EAP method.
-

nm_setting_802_1x_get_system_ca_certs ()

-
gboolean            nm_setting_802_1x_get_system_ca_certs
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_get_ca_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

-Sets the "system-ca-certs" property. The -"ca-path" and "phase2-ca-path" -properties are ignored if the "system-ca-certs" property is -TRUE, in which case a system-wide CA certificate directory specified at -compile time (using the --system-ca-path configure option) is used in place -of these properties. +Returns the CA certificate blob if the CA certificate is stored using the +NM_SETTING_802_1X_CK_SCHEME_BLOB scheme. Not all EAP methods use a +CA certificate (LEAP for example), and those that can take advantage of the +CA certificate allow it to be unset. Note that lack of a CA certificate +reduces security by allowing man-in-the-middle attacks, because the identity +of the network cannot be confirmed by the client.

@@ -928,21 +909,22 @@ of these properties. - +

Returns :

TRUE if a system CA certificate path should be used, FALSE if notthe CA certificate data
-

nm_setting_802_1x_get_ca_path ()

-
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
+

nm_setting_802_1x_get_ca_cert_path ()

+
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

-Returns the path of the CA certificate directory if previously set. Systems -will often have a directory that contains multiple individual CA certificates -which the supplicant can then add to the verification chain. This may be -used in addition to the "ca-cert" property to add more CA -certificates for verifying the network to client. +Returns the CA certificate path if the CA certificate is stored using the +NM_SETTING_802_1X_CK_SCHEME_PATH scheme. Not all EAP methods use a +CA certificate (LEAP for example), and those that can take advantage of the +CA certificate allow it to be unset. Note that lack of a CA certificate +reduces security by allowing man-in-the-middle attacks, because the identity +of the network cannot be confirmed by the client.

@@ -954,22 +936,20 @@ certificates for verifying the network to client. - +

Returns :

the CA certificate directory pathpath to the CA certificate file
-

nm_setting_802_1x_get_phase2_ca_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_path
+
nm_setting_802_1x_get_ca_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

-Returns the path of the "phase 2" CA certificate directory if previously set.
-Systems will often have a directory that contains multiple individual CA
-certificates which the supplicant can then add to the verification chain.
-This may be used in addition to the "phase2-ca-cert" property
-to add more CA certificates for verifying the network to client.
+Returns the scheme used to store the CA certificate.  If the returned scheme
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
 

 
@@ -981,20 +961,21 @@ to add more CA certificates for verifying the network to client.
 
-
+

 

 

 
Returns :
the "phase 2" CA certificate directory pathscheme used to store the CA certificate (blob or path)
-

nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_ca_cert_scheme
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_get_ca_path ()

+
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

-Returns the scheme used to store the CA certificate. If the returned scheme -is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob(); -if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path(). +Returns the path of the CA certificate directory if previously set. Systems +will often have a directory that contains multiple individual CA certificates +which the supplicant can then add to the verification chain. This may be +used in addition to the "ca-cert" property to add more CA +certificates for verifying the network to client.

@@ -1006,23 +987,20 @@ if Returns :

- +
scheme used to store the CA certificate (blob or path)the CA certificate directory path
-

nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_ca_cert_blob
+
nm_setting_802_1x_get_client_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);

 

-Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

 
@@ -1034,23 +1012,20 @@ of the network cannot be confirmed by the client.
 
-
+

 

 

 
Returns :
the CA certificate datathe client certificate data
-

nm_setting_802_1x_get_ca_cert_path ()

-
const char *            nm_setting_802_1x_get_ca_cert_path
+
nm_setting_802_1x_get_client_cert_path ()

+
const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);

 

-Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

 
@@ -1062,24 +1037,20 @@ of the network cannot be confirmed by the client.
 
-
+

 

 

 
Returns :
path to the CA certificate filepath to the client certificate file
-

nm_setting_802_1x_set_ca_cert ()

-
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
+

nm_setting_802_1x_get_client_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+                                                        (NMSetting8021x *setting);

-Reads a certificate from disk and sets the "ca-cert" property -with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB -scheme, or with the path to the certificate file if using the -NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +Returns the scheme used to store the client certificate. If the returned scheme +is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob(); +if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().

@@ -1090,36 +1061,48 @@ scheme, or with the path to the certificate file if using the - - - - - - + + + +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH -or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate -file (PEM or DER format). The path must be UTF-8 encoded; use -g_filename_to_utf8() to convert if needed. Passing NULL with any scheme -clears the CA certificate.

scheme :

desired storage scheme for the certificate

Returns :

scheme used to store the client certificate (blob or path)
+
+
+
+

nm_setting_802_1x_get_eap_method ()

+
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
+                                                         guint32 i);
+

+Returns the name of the allowed EAP method at index i. +

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

out_format :

on successful return, the type of the certificate added

setting :

the NMSetting8021x +

error :

on unsuccessful return, an error

i :

the index of the EAP method name to return

Returns :

TRUE if the operation succeeded, FALSE if it was unsuccessfulthe name of the allowed EAP method at index i +
-

nm_setting_802_1x_get_subject_match ()

-
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
+

nm_setting_802_1x_get_identity ()

+
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
+

+Returns the identifier used by some EAP methods (like TLS) to +authenticate the user. Often this is a username or login name. +

@@ -1130,10 +1113,7 @@ clears the CA certificate. - +

Returns :

the "subject-match" property. This is the -substring to be matched against the subject of the authentication -server certificate, or NULL no subject verification is to be -performed.the user identifier
@@ -1164,43 +1144,39 @@ Returns the number of entries in the
-

nm_setting_802_1x_get_altsubject_match ()

-
const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
+

nm_setting_802_1x_get_num_eap_methods ()

+
guint32             nm_setting_802_1x_get_num_eap_methods
+                                                        (NMSetting8021x *setting);

-Returns the altSubjectName match at index i. +Returns the number of eap methods allowed for use when connecting to the +network. Generally only one EAP method is used. Use the functions +nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(), +and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving +allowed EAP methods.

- - - - - - +

setting :

the NMSettingConnection +the NMSetting8021x

i :

the zero-based index of the array of altSubjectName matches

Returns :

the altSubjectName match at index i -the number of allowed EAP methods
-

nm_setting_802_1x_add_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);
+

nm_setting_802_1x_get_num_phase2_altsubject_matches ()

+
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
+                                                        (NMSetting8021x *setting);

-Adds an allowed alternate subject name match. Until at least one -match is added, the altSubjectName of the remote authentication -server is not verified. +Returns the number of entries in the +"phase2-altsubject-matches" property of this setting.

@@ -1211,26 +1187,16 @@ server is not verified. - - - - - +

altsubject_match :

the altSubjectName to allow for this connection

Returns :

TRUE if the alternative subject name match was -successfully added, FALSE if it was already allowed.the number of phase2-altsubject-matches entries.
-

nm_setting_802_1x_remove_altsubject_match ()

-
void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-

-Removes the allowed altSubjectName at the specified index. -

+

nm_setting_802_1x_get_password ()

+
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
@@ -1240,39 +1206,39 @@ Removes the allowed altSubjectName at the specified index. - - + +

i :

the index of the altSubjectName match to remove

Returns :

the password used by the authentication method, if any, as specified +by the "password" property
-

nm_setting_802_1x_clear_altsubject_matches ()

-
void                nm_setting_802_1x_clear_altsubject_matches
+
nm_setting_802_1x_get_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);

-

-Clears all altSubjectName matches.
-

 
-
+
+
-
+
+
+
+
+
+

 


 
setting :

 the NMSetting8021x
 
Returns :
the NMSettingSecretFlags pertaining to the "password"
+
-

nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_client_cert_scheme
+
nm_setting_802_1x_get_phase1_fast_provisioning ()

+
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);

-

-Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
-

 

@@ -1283,21 +1249,18 @@ if Returns :

-
+

 
 
scheme used to store the client certificate (blob or path)whether "phase 1" PEAP fast provisioning should be used, as specified
+by the "phase1-fast-provisioning" property.  See the
+wpa_supplicant documentation for more details.
-

nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_client_cert_blob
+
nm_setting_802_1x_get_phase1_peaplabel ()

+
const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

 

@@ -1308,21 +1271,20 @@ authentication method.
 
-
+

 
 
 

 
Returns :
the client certificate datawhether the "phase 1" PEAP label is new-style or old-style, to be
+used when authenticating with EAP-PEAP, as contained in the
+"phase1-peaplabel" property.  Valid values are NULL (unset),
+"0" (use old-style label), and "1" (use new-style label).  See the
+wpa_supplicant documentation for more details.
-

nm_setting_802_1x_get_client_cert_path ()

-
const char *            nm_setting_802_1x_get_client_cert_path
+
nm_setting_802_1x_get_phase1_peapver ()

+
const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

 

@@ -1333,70 +1295,46 @@ authentication method.
 
-
+

 
 
 

 
Returns :
path to the client certificate filethe "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the "phase1-peapver" property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
-

nm_setting_802_1x_set_client_cert ()

-
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
+

nm_setting_802_1x_get_phase2_altsubject_match ()

+
const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

-Reads a certificate from disk and sets the "client-cert" -property with the raw certificate data if using the -NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate -file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. -

-

-Client certificates are used to identify the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. +Returns the "phase 2" altSubjectName match at index i.

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

setting :

the NMSetting8021x +the NMSettingConnection

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH -or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client -certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 -encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with -any scheme clears the client certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

i :

the zero-based index of the array of "phase 2" altSubjectName matches

Returns :

TRUE if the operation succeeded, FALSE if it was unsuccessfulthe "phase 2" altSubjectName match at index i +
-

nm_setting_802_1x_get_phase1_peapver ()

-
const char *        nm_setting_802_1x_get_phase1_peapver
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_get_phase2_auth ()

+
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
@@ -1407,17 +1345,16 @@ any scheme clears the client certificate - +

Returns :

the "phase 1" PEAP version to be used when authenticating with -EAP-PEAP as contained in the "phase1-peapver" property. Valid -values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).the "phase 2" non-EAP (ex MD5) allowed authentication method as +specified by the "phase2-auth" property.
-

nm_setting_802_1x_get_phase1_peaplabel ()

-
const char *        nm_setting_802_1x_get_phase1_peaplabel
+
nm_setting_802_1x_get_phase2_autheap ()

+
const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);

 
@@ -1429,20 +1366,25 @@ values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
-
+

 

 
 

 
Returns :
whether the "phase 1" PEAP label is new-style or old-style, to be
-used when authenticating with EAP-PEAP, as contained in the
-"phase1-peaplabel" property.  Valid values are NULL (unset),
-"0" (use old-style label), and "1" (use new-style label).  See the
-wpa_supplicant documentation for more details.the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the "phase2-autheap" property.
-

nm_setting_802_1x_get_phase1_fast_provisioning ()

-
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+
nm_setting_802_1x_get_phase2_ca_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);

+

+Returns the "phase 2" CA certificate blob if the CA certificate is stored
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
+a CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
+

 

@@ -1453,17 +1395,24 @@ wpa_supplicant documentation for more details.
-
+

 
 
 
 

 
Returns :
whether "phase 1" PEAP fast provisioning should be used, as specified
-by the "phase1-fast-provisioning" property.  See the
-wpa_supplicant documentation for more details.the "phase 2" CA certificate data
-

nm_setting_802_1x_get_phase2_auth ()

-
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
+

nm_setting_802_1x_get_phase2_ca_cert_path ()

+
const char *        nm_setting_802_1x_get_phase2_ca_cert_path
+                                                        (NMSetting8021x *setting);
+

+Returns the "phase 2" CA certificate path if the CA certificate is stored +using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. Not all EAP methods use +a CA certificate (LEAP for example), and those that can take advantage of the +CA certificate allow it to be unset. Note that lack of a CA certificate +reduces security by allowing man-in-the-middle attacks, because the identity +of the network cannot be confirmed by the client. +

@@ -1474,17 +1423,22 @@ wpa_supplicant documentation for more details. - +

Returns :

the "phase 2" non-EAP (ex MD5) allowed authentication method as -specified by the "phase2-auth" property.path to the "phase 2" CA certificate file
-

nm_setting_802_1x_get_phase2_autheap ()

-
const char *        nm_setting_802_1x_get_phase2_autheap
+
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

+

+Returns the scheme used to store the "phase 2" CA certificate.  If the
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+use nm_setting_802_1x_get_ca_cert_path().
+

 

@@ -1495,22 +1449,22 @@ specified by the Returns :

-
+

 
 
the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.scheme used to store the "phase 2" CA certificate (blob or path)
-

nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_ca_cert_scheme
+
nm_setting_802_1x_get_phase2_ca_path ()

+
const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);

 

-Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
-use nm_setting_802_1x_get_ca_cert_path().
+Returns the path of the "phase 2" CA certificate directory if previously set.
+Systems will often have a directory that contains multiple individual CA
+certificates which the supplicant can then add to the verification chain.
+This may be used in addition to the "phase2-ca-cert" property
+to add more CA certificates for verifying the network to client.
 

 
@@ -1522,23 +1476,20 @@ use Returns :

-
+

 

scheme used to store the "phase 2" CA certificate (blob or path)the "phase 2" CA certificate directory path
-

nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_ca_cert_blob
+
nm_setting_802_1x_get_phase2_client_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);

 

-Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

 
@@ -1550,23 +1501,20 @@ of the network cannot be confirmed by the client.
 
-
+

 

 

 
Returns :
the "phase 2" CA certificate datathe "phase 2" client certificate data
-

nm_setting_802_1x_get_phase2_ca_cert_path ()

-
const char *            nm_setting_802_1x_get_phase2_ca_cert_path
+
nm_setting_802_1x_get_phase2_client_cert_path ()

+
const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);

 

-Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

 
@@ -1578,25 +1526,22 @@ of the network cannot be confirmed by the client.
 
-
+

 

 

 
Returns :
path to the "phase 2" CA certificate filepath to the "phase 2" client certificate file
-

nm_setting_802_1x_set_phase2_ca_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
+

nm_setting_802_1x_get_phase2_client_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
+                                                        (NMSetting8021x *setting);

-Reads a certificate from disk and sets the "phase2-ca-cert" -property with the raw certificate data if using the -NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate -file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +Returns the scheme used to store the "phase 2" client certificate. If the +returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use +nm_setting_802_1x_get_client_cert_blob(); if +NM_SETTING_802_1X_CK_SCHEME_PATH, use +nm_setting_802_1x_get_client_cert_path().

@@ -1607,37 +1552,27 @@ file if using the cert_path :

- - - - - - - - - - - - - - - - +
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH -or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA -certificate file (PEM or DER format). The path must be UTF-8 encoded; use -g_filename_to_utf8() to convert if needed. Passing NULL with any scheme -clears the "phase2" CA certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

Returns :

TRUE if the operation succeeded, FALSE if it was unsuccessfulscheme used to store the "phase 2" client certificate (blob or path)
-

nm_setting_802_1x_get_phase2_subject_match ()

-
const char *        nm_setting_802_1x_get_phase2_subject_match
+
nm_setting_802_1x_get_phase2_private_key_blob ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
                                                         (NMSetting8021x *setting);

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+

 

@@ -1648,23 +1583,16 @@ clears the "phase2" CA certificate.
-
+

 
 
 
 

 
Returns :
the "phase2-subject-match" property. This is
-the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
-is to be performed.the "phase 2" private key data
-

nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
                                                         (NMSetting8021x *setting);

-

-Returns the number of entries in the
-"phase2-altsubject-matches" property of this setting.
-

 

@@ -1675,51 +1603,39 @@ Returns the number of entries in the
 
-
+

 
 
 

 
Returns :
the number of phase2-altsubject-matches entries.the data format of the "phase 2" private key data stored in the
+"phase2-private-key" property
-

nm_setting_802_1x_get_phase2_altsubject_match ()

-
const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-

-Returns the "phase 2" altSubjectName match at index i. -

+

nm_setting_802_1x_get_phase2_private_key_password ()

+
const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);
- - - - - - +

setting :

the NMSettingConnection +the NMSetting8021x

i :

the zero-based index of the array of "phase 2" altSubjectName matches

Returns :

the "phase 2" altSubjectName match at index i -the private key password used to decrypt the private key if +previously set with nm_setting_802_1x_set_phase2_private_key() or the +"phase2-private-key-password" property.
-

nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);
-

-Adds an allowed alternate subject name match for "phase 2". Until -at least one match is added, the altSubjectName of the "phase 2" -remote authentication server is not verified. -

+

nm_setting_802_1x_get_phase2_private_key_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);
@@ -1729,26 +1645,23 @@ remote authentication server is not verified. - - - - - +

phase2_altsubject_match :

the "phase 2" altSubjectName to allow for this -connection

Returns :

TRUE if the "phase 2" alternative subject name match was -successfully added, FALSE if it was already allowed.the NMSettingSecretFlags pertaining to the +"phase2-private-key-password" +
-

nm_setting_802_1x_remove_phase2_altsubject_match ()

-
void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
+

nm_setting_802_1x_get_phase2_private_key_path ()

+
const char *        nm_setting_802_1x_get_phase2_private_key_path
+                                                        (NMSetting8021x *setting);

-Removes the allowed "phase 2" altSubjectName at the specified index. +Private keys are used to authenticate the connecting client to the network +when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x +authentication method.

@@ -1759,41 +1672,44 @@ Removes the allowed "phase 2" altSubjectName at the specified index. - - - + + +

i :

the index of the "phase 2" altSubjectName match to remove

Returns :

path to the "phase 2" private key file
-

nm_setting_802_1x_clear_phase2_altsubject_matches ()

-
void                nm_setting_802_1x_clear_phase2_altsubject_matches
+
nm_setting_802_1x_get_phase2_private_key_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);

 

-Clears all "phase 2" altSubjectName matches.
+Returns the scheme used to store the "phase 2" private key.  If the returned
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
+nm_setting_802_1x_get_client_cert_path().
 

 
-
+
+
-
+
+
+
+
+
+

 


 
setting :

 the NMSetting8021x
 
Returns :
scheme used to store the "phase 2" private key (blob or path)
-

nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_client_cert_scheme
+
nm_setting_802_1x_get_phase2_subject_match ()

+
const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);

-

-Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
-

 

@@ -1804,21 +1720,18 @@ returned scheme is Returns :

-
+

 
 
scheme used to store the "phase 2" client certificate (blob or path)the "phase2-subject-match" property. This is
+the substring to be matched against the subject of the "phase 2"
+authentication server certificate, or NULL no subject verification
+is to be performed.
-

nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_client_cert_blob
-                                                        (NMSetting8021x *setting);
-

-Client certificates are used to identify the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. -

+

nm_setting_802_1x_get_pin ()

+
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
@@ -1829,21 +1742,16 @@ authentication method. - +

Returns :

the "phase 2" client certificate datathe PIN used by the authentication method, if any, as specified +by the "pin" property
-

nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *            nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);
-

-Client certificates are used to identify the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. -

+

nm_setting_802_1x_get_pin_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
@@ -1854,31 +1762,28 @@ authentication method. - +

Returns :

path to the "phase 2" client certificate filethe NMSettingSecretFlags pertaining to the +"pin" +
-

nm_setting_802_1x_set_phase2_client_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-

-Reads a certificate from disk and sets the "phase2-client-cert" -property with the raw certificate data if using the -NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate -file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. -

+

nm_setting_802_1x_get_private_key_blob ()

+
const GByteArray *  nm_setting_802_1x_get_private_key_blob
+                                                        (NMSetting8021x *setting);

-Client certificates are used to identify the connecting client to the network +Private keys are used to authenticate the connecting client to the network when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x authentication method.

+

+WARNING: the private key property is not a "secret" property, and thus +unencrypted private key data may be readable by unprivileged users. Private +keys should always be encrypted with a private key password. +

@@ -1888,36 +1793,17 @@ authentication method. - - - - - - - - - - - - - - - - - +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH -or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client -certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 -encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with -any scheme clears the "phase2" client certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

Returns :

TRUE if the operation succeeded, FALSE if it was unsuccessfulthe private key data
-

nm_setting_802_1x_get_password ()

-
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
+

nm_setting_802_1x_get_private_key_format ()

+
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+                                                        (NMSetting8021x *setting);
@@ -1928,16 +1814,16 @@ any scheme clears the "phase2" client ce - +

Returns :

the password used by the authentication method, if any, as specified -by the "password" propertythe data format of the private key data stored in the +"private-key" property
-

nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_password_flags
+
nm_setting_802_1x_get_private_key_password ()

+
const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);

 
@@ -1949,16 +1835,18 @@ by the 
 
-
+

 


 
Returns :
the NMSettingSecretFlags pertaining to the "password"
-the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_private_key(), or the
+"private-key-password" property.
-

nm_setting_802_1x_get_pin ()

-
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
+

nm_setting_802_1x_get_private_key_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+                                                        (NMSetting8021x *setting);
@@ -1969,16 +1857,23 @@ by the - +

Returns :

the PIN used by the authentication method, if any, as specified -by the "pin" propertythe NMSettingSecretFlags pertaining to the +"private-key-password" +
-

nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_pin_flags   (NMSetting8021x *setting);
+

nm_setting_802_1x_get_private_key_path ()

+
const char *        nm_setting_802_1x_get_private_key_path
+                                                        (NMSetting8021x *setting);
+

+Private keys are used to authenticate the connecting client to the network +when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x +authentication method. +

@@ -1989,9 +1884,7 @@ by the "pin" property - +

Returns :

the NMSettingSecretFlags pertaining to the -"pin" -path to the private key file
@@ -1999,7 +1892,7 @@ by the "pin" property

nm_setting_802_1x_get_private_key_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_private_key_scheme
+
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
                                                         (NMSetting8021x *setting);

 

 Returns the scheme used to store the private key.  If the returned scheme is
@@ -2025,19 +1918,8 @@ Returns the scheme used to store the private key.  If the returned scheme is
-

nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *      nm_setting_802_1x_get_private_key_blob
-                                                        (NMSetting8021x *setting);
-

-Private keys are used to authenticate the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. -

-

-WARNING: the private key property is not a "secret" property, and thus -unencrypted private key data may be readable by unprivileged users. Private -keys should always be encrypted with a private key password. -

+

nm_setting_802_1x_get_subject_match ()

+
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
@@ -2048,20 +1930,26 @@ keys should always be encrypted with a private key password. - +

Returns :

the private key datathe "subject-match" property. This is the +substring to be matched against the subject of the authentication +server certificate, or NULL no subject verification is to be +performed.
-

nm_setting_802_1x_get_private_key_path ()

-
const char *            nm_setting_802_1x_get_private_key_path
+
nm_setting_802_1x_get_system_ca_certs ()

+
gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Sets the "system-ca-certs" property. The
+"ca-path" and "phase2-ca-path"
+properties are ignored if the "system-ca-certs" property is
+TRUE, in which case a system-wide CA certificate directory specified at
+compile time (using the --system-ca-path configure option) is used in place
+of these properties.
 

 
@@ -2073,45 +1961,34 @@ authentication method.
 
-
+

 

 

 
Returns :
path to the private key fileTRUE if a system CA certificate path should be used, FALSE if not
-

nm_setting_802_1x_set_private_key ()

-
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-

-Private keys are used to authenticate the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. -

-

-This function reads a private key from disk and sets the -"private-key" property with the private key file data if using -the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private -key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. -

+

nm_setting_802_1x_new ()

+
NMSetting *         nm_setting_802_1x_new               (void);

-If password is given, this function attempts to decrypt the private key to -verify that password is correct, and if it is, updates the -"private-key-password" property with the given password. If -the decryption is unsuccessful, FALSE is returned, error is set, and no -internal data is changed. If no password is given, the private key is -assumed to be valid, no decryption is performed, and the password may be set -at a later time. +Creates a new NMSetting8021x object with default values.

+
++ + + + +

Returns :

the new empty NMSetting8021x object
+
+
+
+

nm_setting_802_1x_remove_altsubject_match ()

+
void                nm_setting_802_1x_remove_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

-WARNING: the private key property is not a "secret" property, and thus -unencrypted private key data using the BLOB scheme may be readable by -unprivileged users. Private keys should always be encrypted with a private -key password to prevent unauthorized access to unencrypted private key data. +Removes the allowed altSubjectName at the specified index.

@@ -2122,65 +1999,44 @@ key password to prevent unauthorized access to unencrypted private key data. - - - - - - - - - - - - - - - - - - - - - - + +

key_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or -NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file -(PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use -g_filename_to_utf8() to convert if needed. Passing NULL with any scheme -clears the private key.

password :

password used to decrypt the private key, or NULL if the password -is unknown. If the password is given but fails to decrypt the private key, -an error is returned.

scheme :

desired storage scheme for the private key

out_format :

on successful return, the type of the private key added

error :

on unsuccessful return, an error

Returns :

TRUE if the operation succeeded, FALSE if it was unsuccessful

i :

the index of the altSubjectName match to remove
-

nm_setting_802_1x_get_private_key_password ()

-
const char *            nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-
-- +

nm_setting_802_1x_remove_eap_method ()

+
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
+                                                         guint32 i);
+

+Removes the allowed EAP method at the specified index. +

+
++ - - + +

setting :

 the NMSetting8021x

Returns :

the private key password used to decrypt the private key if -previously set with nm_setting_802_1x_set_private_key(), or the -"private-key-password" property.

i :

the index of the EAP method to remove
-

nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_remove_phase2_altsubject_match ()

+
void                nm_setting_802_1x_remove_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+

+Removes the allowed "phase 2" altSubjectName at the specified index. +

@@ -2190,19 +2046,26 @@ previously set with Returns :

- + +
the NMSettingSecretFlags pertaining to the -"private-key-password" -

i :

the index of the "phase 2" altSubjectName match to remove
-

nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat  nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_set_ca_cert ()

+
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+

+Reads a certificate from disk and sets the "ca-cert" property +with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB +scheme, or with the path to the certificate file if using the +NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +

@@ -2212,24 +2075,50 @@ previously set with cert_path :

+ + + + + + + + + + + + + + + - +
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate +file (PEM or DER format). The path must be UTF-8 encoded; use +g_filename_to_utf8() to convert if needed. Passing NULL with any scheme +clears the CA certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

Returns :

the data format of the private key data stored in the -"private-key" propertyTRUE if the operation succeeded, FALSE if it was unsuccessful
-

nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme  nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_set_client_cert ()

+
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

-Returns the scheme used to store the "phase 2" private key. If the returned -scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use -nm_setting_802_1x_get_client_cert_blob(); if -NM_SETTING_802_1X_CK_SCHEME_PATH, use -nm_setting_802_1x_get_client_cert_path(). +Reads a certificate from disk and sets the "client-cert" +property with the raw certificate data if using the +NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate +file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +

+

+Client certificates are used to identify the connecting client to the network +when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x +authentication method.

@@ -2240,26 +2129,46 @@ scheme is cert_path :

+ + + + + + + + + + + + + + + - +
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client +certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 +encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with +any scheme clears the client certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

Returns :

scheme used to store the "phase 2" private key (blob or path)TRUE if the operation succeeded, FALSE if it was unsuccessful
-

nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *      nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);
-

-Private keys are used to authenticate the connecting client to the network -when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x -authentication method. -

+

nm_setting_802_1x_set_phase2_ca_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

-WARNING: the phase2 private key property is not a "secret" property, and thus -unencrypted private key data may be readable by unprivileged users. Private -keys should always be encrypted with a private key password. +Reads a certificate from disk and sets the "phase2-ca-cert" +property with the raw certificate data if using the +NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate +file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -2270,19 +2179,49 @@ keys should always be encrypted with a private key password. + + + + + + + + + + + + + + + + - +

cert_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA +certificate file (PEM or DER format). The path must be UTF-8 encoded; use +g_filename_to_utf8() to convert if needed. Passing NULL with any scheme +clears the "phase2" CA certificate.

scheme :

desired storage scheme for the certificate

out_format :

on successful return, the type of the certificate added

error :

on unsuccessful return, an error

Returns :

the "phase 2" private key dataTRUE if the operation succeeded, FALSE if it was unsuccessful
-

nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *            nm_setting_802_1x_get_phase2_private_key_path
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_set_phase2_client_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_client_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

-Private keys are used to authenticate the connecting client to the network +Reads a certificate from disk and sets the "phase2-client-cert" +property with the raw certificate data if using the +NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate +file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +

+

+Client certificates are used to identify the connecting client to the network when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x authentication method.

@@ -2295,8 +2234,28 @@ authentication method. +

cert_path :

+when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH +or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client +certificate file (PEM, DER, or PKCS12 format). The path must be UTF-8 +encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with +any scheme clears the "phase2" client certificate. + + +

scheme :

+desired storage scheme for the certificate + + +

out_format :

+on successful return, the type of the certificate added + + +

error :

+on unsuccessful return, an error + +

Returns :

-path to the "phase 2" private key file +TRUE if the operation succeeded, FALSE if it was unsuccessful
@@ -2380,9 +2339,39 @@ an error is returned.
-

nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *            nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
+

nm_setting_802_1x_set_private_key ()

+
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+                                                         const char *key_path,
+                                                         const char *password,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+

+Private keys are used to authenticate the connecting client to the network +when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x +authentication method. +

+

+This function reads a private key from disk and sets the +"private-key" property with the private key file data if using +the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private +key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme. +

+

+If password is given, this function attempts to decrypt the private key to +verify that password is correct, and if it is, updates the +"private-key-password" property with the given password. If +the decryption is unsuccessful, FALSE is returned, error is set, and no +internal data is changed. If no password is given, the private key is +assumed to be valid, no decryption is performed, and the password may be set +at a later time. +

+

+WARNING: the private key property is not a "secret" property, and thus +unencrypted private key data using the BLOB scheme may be readable by +unprivileged users. Private keys should always be encrypted with a private +key password to prevent unauthorized access to unencrypted private key data. +

@@ -2392,53 +2381,34 @@ an error is returned. - - + + - -

Returns :

the private key password used to decrypt the private key if -previously set with nm_setting_802_1x_set_phase2_private_key() or the -"phase2-private-key-password" property.

key_path :

when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or +NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file +(PEM, DER, or PKCS12 format). The path must be UTF-8 encoded; use +g_filename_to_utf8() to convert if needed. Passing NULL with any scheme +clears the private key.
-
-
-
-

nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags  nm_setting_802_1x_get_phase2_private_key_password_flags
-                                                        (NMSetting8021x *setting);
-
-- - - + + - - + + - -

setting :

the NMSetting8021x -

password :

password used to decrypt the private key, or NULL if the password +is unknown. If the password is given but fails to decrypt the private key, +an error is returned.

Returns :

the NMSettingSecretFlags pertaining to the -"phase2-private-key-password" -

scheme :

desired storage scheme for the private key
-
-
-
-

nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat  nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
-
-- - - + + + + + + - +

setting :

the NMSetting8021x -

out_format :

on successful return, the type of the private key added

error :

on unsuccessful return, an error

Returns :

the data format of the "phase 2" private key data stored in the -"phase2-private-key" propertyTRUE if the operation succeeded, FALSE if it was unsuccessful
@@ -2773,6 +2743,6 @@ and
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html index 0e024c2b..d6450cfc 100644 --- a/docs/libnm-util/html/NMSettingBluetooth.html +++ b/docs/libnm-util/html/NMSettingBluetooth.html @@ -8,7 +8,7 @@ - + @@ -44,35 +44,32 @@ 
 #include <nm-setting-bluetooth.h>
 
-#define             NM_SETTING_BLUETOOTH_SETTING_NAME
-enum                NMSettingBluetoothError;
-#define             NM_TYPE_SETTING_BLUETOOTH_ERROR
-#define             NM_SETTING_BLUETOOTH_ERROR
-GQuark              nm_setting_bluetooth_error_quark    (void);
+                    NMSettingBluetooth;
+                    NMSettingBluetoothClass;
+enum                NMSettingBluetoothError;
 #define             NM_SETTING_BLUETOOTH_BDADDR
+#define             NM_SETTING_BLUETOOTH_SETTING_NAME
 #define             NM_SETTING_BLUETOOTH_TYPE
 #define             NM_SETTING_BLUETOOTH_TYPE_DUN
 #define             NM_SETTING_BLUETOOTH_TYPE_PANU
-                    NMSettingBluetooth;
-                    NMSettingBluetoothClass;
-GType               nm_setting_bluetooth_get_type       (void);
-NMSetting *         nm_setting_bluetooth_new            (void);
+GQuark              nm_setting_bluetooth_error_quark    (void);
 const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);
 const char *        nm_setting_bluetooth_get_connection_type
                                                         (NMSettingBluetooth *setting);
+NMSetting *         nm_setting_bluetooth_new            (void);

Object Hierarchy

-
-  GEnum
-   +----NMSettingBluetoothError
-
   GObject
    +----NMSetting
          +----NMSettingBluetooth
+
+  GEnum
+   +----NMSettingBluetoothError
+

Properties

@@ -93,15 +90,30 @@ Point (NAP) profiles.

Details

-

NM_SETTING_BLUETOOTH_SETTING_NAME

-
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
+
NMSettingBluetooth

+
typedef struct _NMSettingBluetooth NMSettingBluetooth;

+

+

+
+
+
+

NMSettingBluetoothClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBluetoothClass;

-

enum NMSettingBluetoothError

+

enum NMSettingBluetoothError

typedef enum {
 	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,
 	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
@@ -140,39 +152,16 @@ must also contain an 
-
NM_TYPE_SETTING_BLUETOOTH_ERROR

-
#define NM_TYPE_SETTING_BLUETOOTH_ERROR (nm_setting_bluetooth_error_get_type ()) 
-

-

-

-
-
-
-

NM_SETTING_BLUETOOTH_ERROR

-
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
+
NM_SETTING_BLUETOOTH_BDADDR

+
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
-

nm_setting_bluetooth_error_quark ()

-
GQuark              nm_setting_bluetooth_error_quark    (void);
-

-Registers an error quark for NMSettingBluetooth if necessary. -

-
-- - - - -

Returns :

the error quark used for NMSettingBluetooth errors.
-
-
-
-

NM_SETTING_BLUETOOTH_BDADDR

-
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
+
NM_SETTING_BLUETOOTH_SETTING_NAME

+
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

 

 

@@ -207,47 +196,16 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
-

NMSettingBluetooth

-
typedef struct _NMSettingBluetooth NMSettingBluetooth;
-

-

-
-
-
-

NMSettingBluetoothClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBluetoothClass;
-
-

-

-
-
-
-

nm_setting_bluetooth_get_type ()

-
GType               nm_setting_bluetooth_get_type       (void);
-

-

-
-
-
-

nm_setting_bluetooth_new ()

-
NMSetting *         nm_setting_bluetooth_new            (void);
+

nm_setting_bluetooth_error_quark ()

+
GQuark              nm_setting_bluetooth_error_quark    (void);

-Creates a new NMSettingBluetooth object with default values. +Registers an error quark for NMSettingBluetooth if necessary.

- +

Returns :

the new empty NMSettingBluetooth object. [transfer full] -the error quark used for NMSettingBluetooth errors.
@@ -299,6 +257,22 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
+
+
+

nm_setting_bluetooth_new ()

+
NMSetting *         nm_setting_bluetooth_new            (void);
+

+Creates a new NMSettingBluetooth object with default values. +

+
++ + + + +

Returns :

the new empty NMSettingBluetooth object. [transfer full] +
+

Property Details

@@ -323,6 +297,6 @@ Area Networking connections to devices supporting the NAP profile.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html index 1c93803d..d0d5634d 100644 --- a/docs/libnm-util/html/NMSettingCdma.html +++ b/docs/libnm-util/html/NMSettingCdma.html @@ -8,7 +8,7 @@ - + @@ -44,37 +44,33 @@ 
 #include <nm-setting-cdma.h>
 
-#define             NM_SETTING_CDMA_SETTING_NAME
-enum                NMSettingCdmaError;
-#define             NM_TYPE_SETTING_CDMA_ERROR
-#define             NM_SETTING_CDMA_ERROR
-GQuark              nm_setting_cdma_error_quark         (void);
+                    NMSettingCdma;
+                    NMSettingCdmaClass;
+enum                NMSettingCdmaError;
 #define             NM_SETTING_CDMA_NUMBER
-#define             NM_SETTING_CDMA_USERNAME
 #define             NM_SETTING_CDMA_PASSWORD
 #define             NM_SETTING_CDMA_PASSWORD_FLAGS
-                    NMSettingCdma;
-                    NMSettingCdmaClass;
-GType               nm_setting_cdma_get_type            (void);
-NMSetting *         nm_setting_cdma_new                 (void);
+#define             NM_SETTING_CDMA_SETTING_NAME
+#define             NM_SETTING_CDMA_USERNAME
+GQuark              nm_setting_cdma_error_quark         (void);
 const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
-const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
-NMSettingSecretFlags  nm_setting_cdma_get_password_flags
-                                                        (NMSettingCdma *setting);
+NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
+const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
+NMSetting *         nm_setting_cdma_new                 (void);

Object Hierarchy

-
-  GEnum
-   +----NMSettingCdmaError
-
   GObject
    +----NMSetting
          +----NMSettingCdma
+
+  GEnum
+   +----NMSettingCdmaError
+

Properties

@@ -96,15 +92,30 @@ networks, including those using CDMA2000/EVDO technology.

Details

-

NM_SETTING_CDMA_SETTING_NAME

-
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
+
NMSettingCdma

+
typedef struct _NMSettingCdma NMSettingCdma;

+

+

+
+
+
+

NMSettingCdmaClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingCdmaClass;

-

enum NMSettingCdmaError

+

enum NMSettingCdmaError

typedef enum {
 	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,
 	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
@@ -142,37 +153,6 @@ is missing in the connection
-

NM_TYPE_SETTING_CDMA_ERROR

-
#define NM_TYPE_SETTING_CDMA_ERROR (nm_setting_cdma_error_get_type ()) 
-
-

-

-
-
-
-

NM_SETTING_CDMA_ERROR

-
#define NM_SETTING_CDMA_ERROR nm_setting_cdma_error_quark ()
-
-

-

-
-
-
-

nm_setting_cdma_error_quark ()

-
GQuark              nm_setting_cdma_error_quark         (void);
-

-Registers an error quark for NMSettingCdma if necessary. -

-
-- - - - -

Returns :

the error quark used for NMSettingCdma errors.
-
-
-

NM_SETTING_CDMA_NUMBER

#define NM_SETTING_CDMA_NUMBER         "number"
@@ -181,14 +161,6 @@ Registers an error quark for -

NM_SETTING_CDMA_USERNAME

-
#define NM_SETTING_CDMA_USERNAME       "username"
-
-

-

-
-
-

NM_SETTING_CDMA_PASSWORD

#define NM_SETTING_CDMA_PASSWORD       "password"
@@ -205,46 +177,32 @@ Registers an error quark for -

NMSettingCdma

-
typedef struct _NMSettingCdma NMSettingCdma;
-

-

-
-
-
-

NMSettingCdmaClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingCdmaClass;
+
NM_SETTING_CDMA_SETTING_NAME

+
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
-

nm_setting_cdma_get_type ()

-
GType               nm_setting_cdma_get_type            (void);
+

NM_SETTING_CDMA_USERNAME

+
#define NM_SETTING_CDMA_USERNAME       "username"
+

-

nm_setting_cdma_new ()

-
NMSetting *         nm_setting_cdma_new                 (void);
+

nm_setting_cdma_error_quark ()

+
GQuark              nm_setting_cdma_error_quark         (void);

-Creates a new NMSettingCdma object with default values. +Registers an error quark for NMSettingCdma if necessary.

- +

Returns :

the new empty NMSettingCdma objectthe error quark used for NMSettingCdma errors.
@@ -269,8 +227,8 @@ Creates a new
-

nm_setting_cdma_get_username ()

-
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
+

nm_setting_cdma_get_password ()

+
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
@@ -281,15 +239,15 @@ Creates a new - +

Returns :

the "username" property of the settingthe "password" property of the setting
-

nm_setting_cdma_get_password ()

-
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
+

nm_setting_cdma_get_password_flags ()

+
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
@@ -300,16 +258,16 @@ Creates a new - +

Returns :

the "password" property of the settingthe NMSettingSecretFlags pertaining to the "password" +
-

nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_cdma_get_password_flags
-                                                        (NMSettingCdma *setting);
+

nm_setting_cdma_get_username ()

+
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
@@ -320,12 +278,26 @@ Creates a new - +

Returns :

the NMSettingSecretFlags pertaining to the "password" -the "username" property of the setting
+
+
+

nm_setting_cdma_new ()

+
NMSetting *         nm_setting_cdma_new                 (void);
+

+Creates a new NMSettingCdma object with default values. +

+
++ + + + +

Returns :

the new empty NMSettingCdma object
+

Property Details

@@ -375,6 +347,6 @@ username is required, it is specified here.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index e0085a7c..0089fc41 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -8,7 +8,7 @@ - + @@ -44,30 +44,28 @@ 
 #include <nm-setting-connection.h>
 
-#define             NM_SETTING_CONNECTION_SETTING_NAME
-enum                NMSettingConnectionError;
-#define             NM_TYPE_SETTING_CONNECTION_ERROR
-#define             NM_SETTING_CONNECTION_ERROR
-GQuark              nm_setting_connection_error_quark   (void);
-#define             NM_SETTING_CONNECTION_ID
-#define             NM_SETTING_CONNECTION_UUID
-#define             NM_SETTING_CONNECTION_TYPE
-#define             NM_SETTING_CONNECTION_AUTOCONNECT
-#define             NM_SETTING_CONNECTION_TIMESTAMP
-#define             NM_SETTING_CONNECTION_READ_ONLY
-#define             NM_SETTING_CONNECTION_PERMISSIONS
                     NMSettingConnection;
                     NMSettingConnectionClass;
-GType               nm_setting_connection_get_type      (void);
-NMSetting *         nm_setting_connection_new           (void);
-const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_connection_type
-                                                        (NMSettingConnection *setting);
+enum                NMSettingConnectionError;
+#define             NM_SETTING_CONNECTION_AUTOCONNECT
+#define             NM_SETTING_CONNECTION_ID
+#define             NM_SETTING_CONNECTION_PERMISSIONS
+#define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_SETTING_NAME
+#define             NM_SETTING_CONNECTION_TIMESTAMP
+#define             NM_SETTING_CONNECTION_TYPE
+#define             NM_SETTING_CONNECTION_UUID
+gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);
+GQuark              nm_setting_connection_error_quark   (void);
 gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);
-guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_connection_type
+                                                        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
 guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_permission
@@ -76,14 +74,13 @@ const char *        const char **out_ptype,
                                                          const char **out_pitem,
                                                          const char **out_detail);
+gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
+NMSetting *         nm_setting_connection_new           (void);
 gboolean            nm_setting_connection_permissions_user_allowed
                                                         (NMSettingConnection *setting,
                                                          const char *uname);
-gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);
 void                nm_setting_connection_remove_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
@@ -91,15 +88,15 @@ const char *        
 
Object Hierarchy

-
-  GEnum
-   +----NMSettingConnectionError
-

 
   GObject
    +----NMSetting
          +----NMSettingConnection
 

+
+  GEnum
+   +----NMSettingConnectionError
+

 
 

 
Properties

@@ -125,17 +122,33 @@ a 
 
Details

 

-
NM_SETTING_CONNECTION_SETTING_NAME

-
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
+
NMSettingConnection

+
typedef struct _NMSettingConnection NMSettingConnection;

+

+The NMSettingConnection struct contains only private data.
+It should only be accessed through the functions described below.
+

+

+

+

+
NMSettingConnectionClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingConnectionClass;
 

 

 

 

 

 

-
enum NMSettingConnectionError

-
typedef enum
-{
+
enum NMSettingConnectionError

+
typedef enum {
 	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,
 	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
 	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
@@ -178,37 +191,14 @@ Describes errors that may result from operations involving a
 

 

 

-
NM_TYPE_SETTING_CONNECTION_ERROR

-
#define NM_TYPE_SETTING_CONNECTION_ERROR (nm_setting_connection_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_ERROR

-
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
+
NM_SETTING_CONNECTION_AUTOCONNECT

+
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 

 

 

 

 

 

-
nm_setting_connection_error_quark ()

-
GQuark              nm_setting_connection_error_quark   (void);

-

-Registers an error quark for NMSettingConnection if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingConnection errors.

-

-

-

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID          "id"
 

@@ -217,24 +207,24 @@ Registers an error quark for 
 

 

-
NM_SETTING_CONNECTION_UUID

-
#define NM_SETTING_CONNECTION_UUID        "uuid"
+
NM_SETTING_CONNECTION_PERMISSIONS

+
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_TYPE

-
#define NM_SETTING_CONNECTION_TYPE        "type"
+
NM_SETTING_CONNECTION_READ_ONLY

+
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_AUTOCONNECT

-
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+
NM_SETTING_CONNECTION_SETTING_NAME

+
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

 

 

@@ -249,73 +239,32 @@ Registers an error quark for 
 

 

-
NM_SETTING_CONNECTION_READ_ONLY

-
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_PERMISSIONS

-
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+
NM_SETTING_CONNECTION_TYPE

+
#define NM_SETTING_CONNECTION_TYPE        "type"
 

 

 

 

 

 

-
NMSettingConnection

-
typedef struct _NMSettingConnection NMSettingConnection;

-

-The NMSettingConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMSettingConnectionClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingConnectionClass;
+
NM_SETTING_CONNECTION_UUID

+
#define NM_SETTING_CONNECTION_UUID        "uuid"
 

 

 

 

 

 

-
nm_setting_connection_get_type ()

-
GType               nm_setting_connection_get_type      (void);

-

-

-

-

-

-
nm_setting_connection_new ()

-
NMSetting *         nm_setting_connection_new           (void);

-

-Creates a new NMSettingConnection object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingConnection object

-

-

-

-
nm_setting_connection_get_id ()

-
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

+
nm_setting_connection_add_permission ()

+
gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);

 

-Returns the "id" property of the connection.
+Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and pitem must be a username. See
+"permissions": for more details.
 

 
@@ -326,55 +275,41 @@ Returns the Returns :

-
+
+
-
-

 

the connection ID
ptype :
the permission type; at this time only "user" is supported
 

-

-

-

-
nm_setting_connection_get_uuid ()

-
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

-

-Returns the "uuid" property of the connection.
-

-

--
-
-
+
+
+
+
+
-
+


 
setting :
the NMSettingConnection
+
pitem :
the permission item formatted as required for ptype
+
detail :
unused at this time; must be NULL. [allow-none]
 
 

 

 
Returns :
the connection UUIDTRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype or pitem was invalid or it the permission was already
+present in the list
 

 
 

 

 

 

-
nm_setting_connection_get_connection_type ()

-
const char *        nm_setting_connection_get_connection_type
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_error_quark ()

+
GQuark              nm_setting_connection_error_quark   (void);

 

-Returns the "type" property of the connection.
+Registers an error quark for NMSettingConnection if necessary.
 

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

 

setting :
the NMSettingConnection
-

 
Returns :
the connection type
the error quark used for NMSettingConnection errors.

 

 

 

@@ -402,10 +337,11 @@ Returns the 
-
nm_setting_connection_get_timestamp ()

-
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

+
nm_setting_connection_get_connection_type ()

+
const char *        nm_setting_connection_get_connection_type
+                                                        (NMSettingConnection *setting);

 

-Returns the "timestamp" property of the connection.
+Returns the "type" property of the connection.
 

 
@@ -417,17 +353,17 @@ Returns the Returns :

-
+

 

the connection's timestampthe connection type
 

 
 

 

 

 

-
nm_setting_connection_get_read_only ()

-
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

+
nm_setting_connection_get_id ()

+
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

 

-Returns the "read-only" property of the connection.
+Returns the "id" property of the connection.
 

 
@@ -439,8 +375,7 @@ Returns the Returns :

-
+

 


-TRUE if the connection is read-only, FALSE if it is notthe connection ID
 

 
 

@@ -517,12 +452,10 @@ of this setting.
 

 

 

-
nm_setting_connection_permissions_user_allowed ()

-
gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);

+
nm_setting_connection_get_read_only ()

+
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

 

-Checks whether the given username is allowed to view/access this connection.
+Returns the "read-only" property of the connection.
 

 
@@ -533,30 +466,19 @@ Checks whether the given username is allowed to view/access this connection.
 
-
-
-
-
+TRUE if the connection is read-only, FALSE if it is not

 

 
 
uname :
the user name to check permissions for

 
Returns :

 
-TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connection
 

 
 

 

 

 

-
nm_setting_connection_add_permission ()

-
gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);

+
nm_setting_connection_get_timestamp ()

+
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

-Adds a permission to the connection's permission list.  At this time, only
-the "user" permission type is supported, and pitem must be a username. See
-"permissions": for more details.
+Returns the "timestamp" property of the connection.
 

 
@@ -567,24 +489,75 @@ the "user" permission type is supported, and pitem
 
 
-
-
+
+
+
+

 

ptype :
the permission type; at this time only "user" is supported
Returns :
the connection's timestamp
 

+

+

+

+
nm_setting_connection_get_uuid ()

+
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

+

+Returns the "uuid" property of the connection.
+

+

++
-
-
+
-
-
+
+
+
+


 
pitem :
the permission item formatted as required for ptype
+
setting :
the NMSettingConnection
 
 

 
detail :
unused at this time; must be NULL. [allow-none]
+
Returns :
the connection UUID

+

+

+

+
nm_setting_connection_new ()

+
NMSetting *         nm_setting_connection_new           (void);

+

+Creates a new NMSettingConnection object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingConnection object

+

+

+

+
nm_setting_connection_permissions_user_allowed ()

+
gboolean            nm_setting_connection_permissions_user_allowed
+                                                        (NMSettingConnection *setting,
+                                                         const char *uname);

+

+Checks whether the given username is allowed to view/access this connection.
+

+

++
+
+
+
+
+
+
+
-
+


setting :
the NMSettingConnection
 
 

 
uname :
the user name to check permissions for

 
Returns :
TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype or pitem was invalid or it the permission was already
-present in the list
+TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection
 

 
 

@@ -717,6 +690,6 @@ be generated by 
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 439dea0d..ce1012f4 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,52 +44,49 @@
 
 #include <nm-setting-gsm.h>
 
-#define             NM_SETTING_GSM_SETTING_NAME
-enum                NMSettingGsmError;
-#define             NM_TYPE_SETTING_GSM_ERROR
-#define             NM_SETTING_GSM_ERROR
-GQuark              nm_setting_gsm_error_quark          (void);
-#define             NM_SETTING_GSM_NUMBER
-#define             NM_SETTING_GSM_USERNAME
-#define             NM_SETTING_GSM_PASSWORD
-#define             NM_SETTING_GSM_PASSWORD_FLAGS
+                    NMSettingGsm;
+                    NMSettingGsmClass;
+enum                NMSettingGsmError;
+enum                NMSettingGsmNetworkBand;
+enum                NMSettingGsmNetworkType;
+#define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_APN
+#define             NM_SETTING_GSM_HOME_ONLY
 #define             NM_SETTING_GSM_NETWORK_ID
 #define             NM_SETTING_GSM_NETWORK_TYPE
-#define             NM_SETTING_GSM_ALLOWED_BANDS
+#define             NM_SETTING_GSM_NUMBER
+#define             NM_SETTING_GSM_PASSWORD
+#define             NM_SETTING_GSM_PASSWORD_FLAGS
 #define             NM_SETTING_GSM_PIN
 #define             NM_SETTING_GSM_PIN_FLAGS
-#define             NM_SETTING_GSM_HOME_ONLY
-enum                NMSettingGsmNetworkType;
-enum                NMSettingGsmNetworkBand;
-                    NMSettingGsm;
-                    NMSettingGsmClass;
-GType               nm_setting_gsm_get_type             (void);
-NMSetting *         nm_setting_gsm_new                  (void);
-const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
+#define             NM_SETTING_GSM_SETTING_NAME
+#define             NM_SETTING_GSM_USERNAME
+GQuark              nm_setting_gsm_error_quark          (void);
+guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);
+gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);
 int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
-guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
-gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
-NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);
-NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
+NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
+NMSetting *         nm_setting_gsm_new                  (void);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingGsmError
-

 
   GObject
    +----NMSetting
          +----NMSettingGsm
 

+
+  GEnum
+   +----NMSettingGsmError
+

 

 

 
Properties

@@ -118,15 +115,30 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 

 
Details

 

-
NM_SETTING_GSM_SETTING_NAME

-
#define NM_SETTING_GSM_SETTING_NAME "gsm"
+
NMSettingGsm

+
typedef struct _NMSettingGsm NMSettingGsm;

+

+

+

+

+

+
NMSettingGsmClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingGsmClass;
 

 

 

 

 

 

-
enum NMSettingGsmError

+
enum NMSettingGsmError

 
typedef enum {
 	NM_SETTING_GSM_ERROR_UNKNOWN = 0,
 	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
@@ -164,175 +176,6 @@ is missing in the connection
 

 

 

-
NM_TYPE_SETTING_GSM_ERROR

-
#define NM_TYPE_SETTING_GSM_ERROR (nm_setting_gsm_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_GSM_ERROR

-
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
-

-

-

-

-

-

-
nm_setting_gsm_error_quark ()

-
GQuark              nm_setting_gsm_error_quark          (void);

-

-Registers an error quark for NMSettingGsm if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingGsm errors.

-

-

-

-
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER         "number"
-

-

-

-

-

-

-
NM_SETTING_GSM_USERNAME

-
#define NM_SETTING_GSM_USERNAME       "username"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD

-
#define NM_SETTING_GSM_PASSWORD       "password"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD_FLAGS

-
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_APN

-
#define NM_SETTING_GSM_APN            "apn"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_ID

-
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_TYPE

-
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
-

-

-

-

-

-

-
NM_SETTING_GSM_ALLOWED_BANDS

-
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN

-
#define NM_SETTING_GSM_PIN            "pin"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN_FLAGS

-
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_HOME_ONLY

-
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
-

-

-

-

-

-

-
enum NMSettingGsmNetworkType

-
typedef enum {
-	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
-	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
-	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3
-} NMSettingGsmNetworkType;
-

-

-NMSettingGsmNetworkType values indicate the allowed access technologies
-the device may use when connecting to this network.
-

-

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


NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
-
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
-preferred but 2G-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
-preferred but 3G-type technologies may be used as a fallback
-

-

-

-

 
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -439,53 +282,169 @@ the device may use when connecting to this network.
 

 

 

-
NMSettingGsm

-
typedef struct _NMSettingGsm NMSettingGsm;

+
enum NMSettingGsmNetworkType

+
typedef enum {
+	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
+	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
+	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3
+} NMSettingGsmNetworkType;
+

 

+NMSettingGsmNetworkType values indicate the allowed access technologies
+the device may use when connecting to this network.
 

+

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


NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
+
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
+preferred but 2G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
+preferred but 3G-type technologies may be used as a fallback
+

 

 

 

-
NMSettingGsmClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingGsmClass;
+
NM_SETTING_GSM_ALLOWED_BANDS

+
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 

 

 

 

 

 

-
nm_setting_gsm_get_type ()

-
GType               nm_setting_gsm_get_type             (void);

+
NM_SETTING_GSM_APN

+
#define NM_SETTING_GSM_APN            "apn"
+

 

 

 

 

 

-
nm_setting_gsm_new ()

-
NMSetting *         nm_setting_gsm_new                  (void);

+
NM_SETTING_GSM_HOME_ONLY

+
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_ID

+
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_TYPE

+
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
+

+

+

+

+

+

+
NM_SETTING_GSM_NUMBER

+
#define NM_SETTING_GSM_NUMBER         "number"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD

+
#define NM_SETTING_GSM_PASSWORD       "password"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD_FLAGS

+
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_PIN

+
#define NM_SETTING_GSM_PIN            "pin"
+

 

-Creates a new NMSettingGsm object with default values.
+

+

+

+

+
NM_SETTING_GSM_PIN_FLAGS

+
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_SETTING_NAME

+
#define NM_SETTING_GSM_SETTING_NAME "gsm"
+

+

+

+

+

+

+
NM_SETTING_GSM_USERNAME

+
#define NM_SETTING_GSM_USERNAME       "username"
+

+

+

+

+

+

+
nm_setting_gsm_error_quark ()

+
GQuark              nm_setting_gsm_error_quark          (void);

+

+Registers an error quark for NMSettingGsm if necessary.
 

 

-
+

 
 

 
Returns :
the new empty NMSettingGsm objectthe error quark used for NMSettingGsm errors.
 

 

 

 

 

-
nm_setting_gsm_get_number ()

-
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

+
nm_setting_gsm_get_allowed_bands ()

+
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

 

@@ -496,15 +455,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "number" property of the settingthe "allowed-bands" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_username ()

-
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

+
nm_setting_gsm_get_apn ()

+
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

 

@@ -515,15 +474,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "username" property of the settingthe "apn" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_password ()

-
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

+
nm_setting_gsm_get_home_only ()

+
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

 

@@ -534,15 +493,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "password" property of the settingthe "home-only" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_apn ()

-
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

+
nm_setting_gsm_get_network_id ()

+
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

 

@@ -553,15 +512,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "apn" property of the settingthe "network-id" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_id ()

-
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

+
nm_setting_gsm_get_network_type ()

+
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

 

@@ -572,15 +531,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "network-id" property of the settingthe "network-type" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_type ()

-
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

+
nm_setting_gsm_get_number ()

+
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

 

@@ -591,15 +550,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "network-type" property of the settingthe "number" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_allowed_bands ()

-
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

+
nm_setting_gsm_get_password ()

+
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

 

@@ -610,15 +569,15 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "allowed-bands" property of the settingthe "password" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_pin ()

-
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

+
nm_setting_gsm_get_password_flags ()

+
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

 

@@ -629,15 +588,16 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "pin" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

 

 

-
nm_setting_gsm_get_home_only ()

-
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

+
nm_setting_gsm_get_pin ()

+
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

 

@@ -648,7 +608,7 @@ Creates a new 
 
-
+

 
 

 
Returns :
the "home-only" property of the settingthe "pin" property of the setting
 

 
 

@@ -656,7 +616,7 @@ Creates a new 
 

 
nm_setting_gsm_get_pin_flags ()

-
NMSettingSecretFlags  nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);

+
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

 

@@ -675,8 +635,8 @@ Creates a new 
 

 

-
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_gsm_get_password_flags (NMSettingGsm *setting);

+
nm_setting_gsm_get_username ()

+
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

 

 
 

@@ -687,12 +647,26 @@ Creates a new 
 
-
+

 
 

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
-the "username" property of the setting
 

 
 

 

+

+

+
nm_setting_gsm_new ()

+
NMSetting *         nm_setting_gsm_new                  (void);

+

+Creates a new NMSettingGsm object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingGsm object

+

 

 

 
Property Details

@@ -827,6 +801,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 488f842a..aee7ddc8 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,135 +41,126 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-ip4-config.h>
 
-#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
-enum                NMSettingIP4ConfigError;
-#define             NM_TYPE_SETTING_IP4_CONFIG_ERROR
-#define             NM_SETTING_IP4_CONFIG_ERROR
-GQuark              nm_setting_ip4_config_error_quark   (void);
-#define             NM_SETTING_IP4_CONFIG_METHOD
-#define             NM_SETTING_IP4_CONFIG_DNS
-#define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
+typedef             NMIP4Address;
+typedef             NMIP4Route;
+                    NMSettingIP4Config;
+                    NMSettingIP4ConfigClass;
+enum                NMSettingIP4ConfigError;
 #define             NM_SETTING_IP4_CONFIG_ADDRESSES
-#define             NM_SETTING_IP4_CONFIG_ROUTES
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
 #define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
 #define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_DNS
+#define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
+#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
 #define             NM_SETTING_IP4_CONFIG_MAY_FAIL
+#define             NM_SETTING_IP4_CONFIG_METHOD
 #define             NM_SETTING_IP4_CONFIG_METHOD_AUTO
+#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 #define             NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-typedef             NMIP4Address;
-GType               nm_ip4_address_get_type             (void);
-NMIP4Address *      nm_ip4_address_new                  (void);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
-void                nm_ip4_address_unref                (NMIP4Address *address);
+#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+#define             NM_SETTING_IP4_CONFIG_ROUTES
+#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
 gboolean            nm_ip4_address_compare              (NMIP4Address *address,
                                                          NMIP4Address *other);
+NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
 guint32             nm_ip4_address_get_address          (NMIP4Address *address);
+guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
+guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
+NMIP4Address *      nm_ip4_address_new                  (void);
+void                nm_ip4_address_ref                  (NMIP4Address *address);
 void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-void                nm_ip4_address_set_prefix           (NMIP4Address *address,
-                                                         guint32 prefix);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
 void                nm_ip4_address_set_gateway          (NMIP4Address *address,
                                                          guint32 gateway);
-typedef             NMIP4Route;
-GType               nm_ip4_route_get_type               (void);
-NMIP4Route *        nm_ip4_route_new                    (void);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
+void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+                                                         guint32 prefix);
+void                nm_ip4_address_unref                (NMIP4Address *address);
 gboolean            nm_ip4_route_compare                (NMIP4Route *route,
                                                          NMIP4Route *other);
+NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
 guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
+guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
+guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
+guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
+NMIP4Route *        nm_ip4_route_new                    (void);
+void                nm_ip4_route_ref                    (NMIP4Route *route);
 void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
 void                nm_ip4_route_set_metric             (NMIP4Route *route,
                                                          guint32 metric);
-                    NMSettingIP4Config;
-                    NMSettingIP4ConfigClass;
-GType               nm_setting_ip4_config_get_type      (void);
-NMSetting *         nm_setting_ip4_config_new           (void);
-const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);
+void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+                                                         guint32 next_hop);
+void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+                                                         guint32 prefix);
+void                nm_ip4_route_unref                  (NMIP4Route *route);
+gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);
 gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
                                                          guint32 dns);
-void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns_searches
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
 gboolean            nm_setting_ip4_config_add_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          const char *dns_search);
-void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_dns_searches
+gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);
+void                nm_setting_ip4_config_clear_addresses
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_addresses
+void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
+GQuark              nm_setting_ip4_config_error_quark   (void);
 NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
-void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_addresses
+const char *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_routes
+const char *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+                                                        (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
-void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
+const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
                                                          guint32 i);
-void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_ignore_auto_routes
-                                                        (NMSettingIP4Config *setting);
 gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_client_id
+gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
+const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
+gboolean            nm_setting_ip4_config_get_never_default
                                                         (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_hostname
+guint32             nm_setting_ip4_config_get_num_addresses
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_never_default
+guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_routes
+                                                        (NMSettingIP4Config *setting);
+NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+                                                         guint32 i);
+NMSetting *         nm_setting_ip4_config_new           (void);
+void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
+                                                         guint32 i);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP4ConfigError
-

 
   GBoxed
    +----NMIP4Address
@@ -183,6 +174,10 @@ const char *        NMSetting
          +----NMSettingIP4Config
 

+
+  GEnum
+   +----NMSettingIP4ConfigError
+

 

 

 
Properties

@@ -211,15 +206,46 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 

 
Details

 

-
NM_SETTING_IP4_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
+
NMIP4Address

+
typedef struct NMIP4Address NMIP4Address;
+

+

+

+

+

+

+
NMIP4Route

+
typedef struct NMIP4Route NMIP4Route;
+

+

+

+

+

+

+
NMSettingIP4Config

+
typedef struct _NMSettingIP4Config NMSettingIP4Config;

+

+

+

+

+

+
NMSettingIP4ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP4ConfigClass;
 

 

 

 

 

 

-
enum NMSettingIP4ConfigError

+
enum NMSettingIP4ConfigError

 
typedef enum {
 	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,
 	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
@@ -257,39 +283,32 @@ not valid with the given IP4 method
 

 

 

-
NM_TYPE_SETTING_IP4_CONFIG_ERROR

-
#define NM_TYPE_SETTING_IP4_CONFIG_ERROR (nm_setting_ip4_config_error_get_type ()) 
+
NM_SETTING_IP4_CONFIG_ADDRESSES

+
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_ERROR

-
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

+
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

 

 

 

 

 

-
nm_setting_ip4_config_error_quark ()

-
GQuark              nm_setting_ip4_config_error_quark   (void);

+
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

 

-Registers an error quark for NMSettingIP4Config if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMSettingIP4Config errors.

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD

-
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
+
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

 

 

@@ -312,159 +331,140 @@ Registers an error quark for 
 

 

-
NM_SETTING_IP4_CONFIG_ADDRESSES

-
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_ROUTES

-
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
+
NM_SETTING_IP4_CONFIG_MAY_FAIL

+
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+
NM_SETTING_IP4_CONFIG_METHOD

+
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

-
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
+
NM_SETTING_IP4_CONFIG_METHOD_AUTO

+
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
 

 

+IPv4 configuration should be automatically determined via a method appropriate
+for the hardware interface, ie DHCP or PPP or some other device-specific
+manner.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
+
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

+
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 

 

+This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
 

 

+IPv4 configuration should be automatically configured for link-local-only
+operation.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
+
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
 

 

+All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
+in the setting's properties.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_MAY_FAIL

-
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
+
NM_SETTING_IP4_CONFIG_METHOD_SHARED

+
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 

 

+This connection specifies configuration that allows other computers to
+connect through it to the default network (usually the Internet).  The
+connection's interface will be assigned a private address, and a DHCP server,
+caching DNS server, and Network Address Translation (NAT) functionality will
+be started on this connection's interface to allow other devices to connect
+through that interface to the default network.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_AUTO

-
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
-

-

-IPv4 configuration should be automatically determined via a method appropriate
-for the hardware interface, ie DHCP or PPP or some other device-specific
-manner.
-

-

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
-

-

-IPv4 configuration should be automatically configured for link-local-only
-operation.
-

-

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
-

-

-All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
-in the setting's properties.
-

-

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_SHARED

-
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
+
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

 

-This connection specifies configuration that allows other computers to
-connect through it to the default network (usually the Internet).  The
-connection's interface will be assigned a private address, and a DHCP server,
-caching DNS server, and Network Address Translation (NAT) functionality will
-be started on this connection's interface to allow other devices to connect
-through that interface to the default network.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

-
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
+
NM_SETTING_IP4_CONFIG_ROUTES

+
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

 

-This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NMIP4Address

-
typedef struct NMIP4Address NMIP4Address;
+
NM_SETTING_IP4_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

 

 

 

 

 

-
nm_ip4_address_get_type ()

-
GType               nm_ip4_address_get_type             (void);

-

-

-

-

-

-
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

+
nm_ip4_address_compare ()

+
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);

 

-Creates and returns a new NMIP4Address object.
+Determines if two NMIP4Address objects contain the same values.
 

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

 

Returns :
the new empty NMIP4Address object. [transfer full]
+
address :
the NMIP4Address
 
other :
the NMIP4Address to compare address to.
Returns :

+TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

@@ -491,44 +491,55 @@ Copies a given 
 

 

-
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

+
nm_ip4_address_get_address ()

+
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

 

-Increases the reference count of the object.
+Gets the IPv4 address property of this address object.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
address :

 the NMIP4Address
 
Returns :
the IPv4 address in network byte order

 

 

 

 

-
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

+
nm_ip4_address_get_gateway ()

+
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Gets the IPv4 default gateway property of this address object.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
address :

 the NMIP4Address
 
Returns :
the IPv4 gateway address in network byte order

 

 

 

 

-
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

+
nm_ip4_address_get_prefix ()

+
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

 

-Determines if two NMIP4Address objects contain the same values.
+Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
+object.
 

 
@@ -539,37 +550,42 @@ Determines if two 
 
 
-
-
-
-
-
+

 

other :
the NMIP4Address to compare address to.

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.the IPv4 address prefix
 

 
 

 

 

 

-
nm_ip4_address_get_address ()

-
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

+
nm_ip4_address_new ()

+
NMIP4Address *      nm_ip4_address_new                  (void);

 

-Gets the IPv4 address property of this address object.
+Creates and returns a new NMIP4Address object.
 

 
-
-
+
+
+
+
+

 

Returns :
the new empty NMIP4Address object. [transfer full]
+

+

+

+

+
nm_ip4_address_ref ()

+
void                nm_ip4_address_ref                  (NMIP4Address *address);

+

+Increases the reference count of the object.
+

+

++
-
-
-
-
-
-
+



 
address :

 the NMIP4Address
 
Returns :
the IPv4 address in network byte order

 

 

 

@@ -597,11 +613,11 @@ Sets the IPv4 address property of this object.
 

 

 

-
nm_ip4_address_get_prefix ()

-
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

+
nm_ip4_address_set_gateway ()

+
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+                                                         guint32 gateway);

 

-Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
-object.
+Sets the IPv4 default gateway property of this address object.
 

 
@@ -612,8 +628,8 @@ object.
 
-
-
+
+

 

 
 
Returns :
the IPv4 address prefix
gateway :
the IPv4 default gateway in network byte order
 

 
 

@@ -643,78 +659,47 @@ Sets the IPv4 address prefix.
 

 

 

-
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

+
nm_ip4_address_unref ()

+
void                nm_ip4_address_unref                (NMIP4Address *address);

 

-Gets the IPv4 default gateway property of this address object.
+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

 
-
-
+
-
-
-
-
-
-
+

 


 
address :

 the NMIP4Address
 
Returns :
the IPv4 gateway address in network byte order

 

 

 

 

-
nm_ip4_address_set_gateway ()

-
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
-                                                         guint32 gateway);

+
nm_ip4_route_compare ()

+
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
+                                                         NMIP4Route *other);

 

-Sets the IPv4 default gateway property of this address object.
+Determines if two NMIP4Route objects contain the same values.
 

 

-
-
+
-
-
+
+
-
-

 
 
 
address :
the NMIP4Address
+
route :
the NMIP4Route
 
 

 
gateway :
the IPv4 default gateway in network byte order
other :
the NMIP4Route to compare route to.
 

-

-

-

-
NMIP4Route

-
typedef struct NMIP4Route NMIP4Route;
-

-

-

-

-

-

-
nm_ip4_route_get_type ()

-
GType               nm_ip4_route_get_type               (void);

-

-

-

-

-

-
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

-

-Creates and returns a new NMIP4Route object.
-

-

--
+
-
-
+
+
+



 
Returns :
the new empty NMIP4Route object. [transfer full]
-

+TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

@@ -741,44 +726,55 @@ Copies a given 
 

 

-
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

+
nm_ip4_route_get_dest ()

+
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

 

-Increases the reference count of the object.
+Gets the IPv4 destination address property of this route object.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
route :

 the NMIP4Route
 
Returns :
the IPv4 address in network byte order

 

 

 

 

-
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

+
nm_ip4_route_get_metric ()

+
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
route :

 the NMIP4Route
 
Returns :
the route metric

 

 

 

 

-
nm_ip4_route_compare ()

-
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);

+
nm_ip4_route_get_next_hop ()

+
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

 

-Determines if two NMIP4Route objects contain the same values.
+Gets the IPv4 address of the next hop of this route.
 

 
@@ -789,23 +785,18 @@ Determines if two 
 
 
-
-
-
-
-
+

 

other :
the NMIP4Route to compare route to.

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.the IPv4 address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

+
nm_ip4_route_get_prefix ()

+
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

 

-Gets the IPv4 destination address property of this route object.
+Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
 

 
@@ -817,63 +808,50 @@ Gets the IPv4 destination address property of this route object.
 
-
+

 

 

 
Returns :
the IPv4 address in network byte orderthe IPv4 prefix
 

 
 

 

 

 

-
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
-                                                         guint32 dest);

+
nm_ip4_route_new ()

+
NMIP4Route *        nm_ip4_route_new                    (void);

 

-Sets the IPv4 destination address property of this route object.
+Creates and returns a new NMIP4Route object.
 

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

 

route :
the NMIP4Route
+
Returns :
the new empty NMIP4Route object. [transfer full]
 
dest :
the destination address in network byte order

 

 

 

 

-
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

+
nm_ip4_route_ref ()

+
void                nm_ip4_route_ref                    (NMIP4Route *route);

 

-Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
+Increases the reference count of the object.
 

 
-
-
+
-
-
-
-
-
-
+

 


 
route :

 the NMIP4Route
 
Returns :
the IPv4 prefix

 

 

 

 

-
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);

+
nm_ip4_route_set_dest ()

+
void                nm_ip4_route_set_dest               (NMIP4Route *route,
+                                                         guint32 dest);

 

-Sets the IPv4 prefix of this route.
+Sets the IPv4 destination address property of this route object.
 

 
@@ -884,18 +862,20 @@ Sets the IPv4 prefix of this route.
 
-
-
+
+

 

 
 
prefix :
the prefix, a number between 1 and 32 inclusive
dest :
the destination address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

+
nm_ip4_route_set_metric ()

+
void                nm_ip4_route_set_metric             (NMIP4Route *route,
+                                                         guint32 metric);

 

-Gets the IPv4 address of the next hop of this route.
+Sets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

 
@@ -906,8 +886,8 @@ Gets the IPv4 address of the next hop of this route.
 
-
-
+
+

 

 
 
Returns :
the IPv4 address in network byte order
metric :
the route metric
 

 
 

@@ -937,11 +917,11 @@ Sets the IPv4 address of the next hop of this route.
 

 

 

-
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

+
nm_ip4_route_set_prefix ()

+
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+                                                         guint32 prefix);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Sets the IPv4 prefix of this route.
 

 
@@ -952,88 +932,40 @@ Gets the route metric property of this route object; lower values indicate
 
-
-
+
+

 

 
 
Returns :
the route metric
prefix :
the prefix, a number between 1 and 32 inclusive
 

 
 

 

 

 

-
nm_ip4_route_set_metric ()

-
void                nm_ip4_route_set_metric             (NMIP4Route *route,
-                                                         guint32 metric);

+
nm_ip4_route_unref ()

+
void                nm_ip4_route_unref                  (NMIP4Route *route);

 

-Sets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

 
-
-
+
-
-
-
-
-
-
+

 


 
route :

 the NMIP4Route
 
metric :
the route metric

 

 

 

 

-
NMSettingIP4Config

-
typedef struct _NMSettingIP4Config NMSettingIP4Config;

-

-

-

-

-

-
NMSettingIP4ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP4ConfigClass;
-

-

-

-

-

-

-
nm_setting_ip4_config_get_type ()

-
GType               nm_setting_ip4_config_get_type      (void);

-

-

-

-

-

-
nm_setting_ip4_config_new ()

-
NMSetting *         nm_setting_ip4_config_new           (void);

+
nm_setting_ip4_config_add_address ()

+
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);

 

-Creates a new NMSettingIP4Config object with default values.
+Adds a new IPv4 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
 

 
-
-
-
-
-

 

Returns :
the new empty NMSettingIP4Config object. [transfer full]
-

-

-

-

-
nm_setting_ip4_config_get_method ()

-
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

-

-
@@ -1041,16 +973,26 @@ Creates a new address :

+
+
+
-
+

 
 

 
setting :
the new address to add

 
Returns :
the "method" property of the setting
+TRUE if the address was added; FALSE if the address was already
+known.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_dns ()

-
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_dns ()

+
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
+                                                         guint32 dns);

+

+Adds a new DNS server to the setting.
+

 

@@ -1060,17 +1002,27 @@ Creates a new dns :

+
+
+
-
+

 
 
the IPv4 address (network byte order) of the DNS server to add

 
Returns :
the number of configured DNS servers
+TRUE if the DNS server was added; FALSE if the server was already
+known
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dns ()

-
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_add_dns_search ()

+
gboolean            nm_setting_ip4_config_add_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         const char *dns_search);

+

+Adds a new DNS search domain to the setting.
+

 

@@ -1080,25 +1032,26 @@ Creates a new i :

-
+
+
-
+

 
 
index number of the DNS server to return
dns_search :
the search domain to add
 

 

 
Returns :
the IPv4 address (network byte order) of the DNS server at index
-i
-
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip4_config_add_dns ()

-
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
-                                                         guint32 dns);

+
nm_setting_ip4_config_add_route ()

+
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);

 

-Adds a new DNS server to the setting.
+Adds a new IPv4 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

 
@@ -1109,39 +1062,32 @@ Adds a new DNS server to the setting.
 
-
-
+
+
+TRUE if the route was added; FALSE if the route was already known.

 

 
 
dns :
the IPv4 address (network byte order) of the DNS server to add
route :
the route to add
 

 

 
Returns :

 
-TRUE if the DNS server was added; FALSE if the server was already
-known
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns ()

-
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_clear_addresses ()

+
void                nm_setting_ip4_config_clear_addresses
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS server at index i.
+Removes all configured addresses.
 

 
-
-
+
-
-
-
-
-
-
+

 


 
setting :

 the NMSettingIP4Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1162,29 +1108,56 @@ Removes all configured DNS servers.
 

 

 

-
nm_setting_ip4_config_get_num_dns_searches ()

-
guint32             nm_setting_ip4_config_get_num_dns_searches
+
nm_setting_ip4_config_clear_dns_searches ()

+
void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);

+

+Removes all configured DNS search domains.
+

 
-
-
+
-
-
+
+

 


 
setting :

 the NMSettingIP4Config
 

+

+

+

+
nm_setting_ip4_config_clear_routes ()

+
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

+

+Removes all configured routes.
+

+

++
+
+
+
+


setting :
the NMSettingIP4Config
+

+

+

+

+
nm_setting_ip4_config_error_quark ()

+
GQuark              nm_setting_ip4_config_error_quark   (void);

+

+Registers an error quark for NMSettingIP4Config if necessary.
+

+

++
-
-
-
+
+



 
Returns :
the number of configured DNS search domains
the error quark used for NMSettingIP4Config errors.

 

 

 

 

-
nm_setting_ip4_config_get_dns_search ()

-
const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_address ()

+
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);

 
@@ -1196,11 +1169,11 @@ Removes all configured DNS servers.
 
-
+
-
@@ -1208,12 +1181,12 @@ Removes all configured DNS servers.
 

-
nm_setting_ip4_config_add_dns_search ()

-
gboolean            nm_setting_ip4_config_add_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         const char *dns_search);

+
nm_setting_ip4_config_get_dhcp_client_id ()

+
const char *        nm_setting_ip4_config_get_dhcp_client_id
+                                                        (NMSettingIP4Config *setting);

 

-Adds a new DNS search domain to the setting.
+Returns the value contained in the "dhcp-client-id"
+property.
 

 

 

 

 
i :
index number of the DNS search domain to returnindex number of the address to return
 

 

 
Returns :
the DNS search domain at index i
+the address at index i
 
 

 
 
 
@@ -1224,26 +1197,21 @@ Adds a new DNS search domain to the setting.
 
-
-
-
-
-
+

 

 
 
dns_search :
the search domain to add

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already knownthe configured Client ID to send to the DHCP server when requesting
+addresses via DHCP.
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns_search ()

-
void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip4_config_get_dhcp_hostname
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "dhcp-hostname"
+property.
 

 
@@ -1254,34 +1222,44 @@ Removes the DNS search domain at index i
-
-
+
+

 

 
 
 
i :
index number of the DNS search domain
Returns :
the configured hostname to send to the DHCP server
 

 
 

 

 

 

-
nm_setting_ip4_config_clear_dns_searches ()

-
void                nm_setting_ip4_config_clear_dns_searches
+
nm_setting_ip4_config_get_dhcp_send_hostname ()

+
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (NMSettingIP4Config *setting);

 

-Removes all configured DNS search domains.
+Returns the value contained in the "dhcp-send-hostname"
+property.
 

 
-
+
+
-
+
+
+
+
+
+

 


 
setting :

 the NMSettingIP4Config
 
Returns :

+TRUE if NetworkManager should send the machine hostname to the
+DHCP server when requesting addresses to allow the server to automatically
+update DNS information for this machine.

 

 

 

 

-
nm_setting_ip4_config_get_num_addresses ()

-
guint32             nm_setting_ip4_config_get_num_addresses
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_get_dns ()

+
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

@@ -1291,16 +1269,23 @@ Removes all configured DNS search domains.
 
+
+
+
+
-
+

 
 
 
 
i :
index number of the DNS server to return

 
Returns :
the number of configured addressesthe IPv4 address (network byte order) of the DNS server at index
+i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_dns_search ()

+
const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
                                                          guint32 i);

 
@@ -1312,11 +1297,11 @@ Removes all configured DNS search domains.
 
-
+
-
@@ -1324,12 +1309,12 @@ Removes all configured DNS search domains.
 

-
nm_setting_ip4_config_add_address ()

-
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

+
nm_setting_ip4_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
+                                                        (NMSettingIP4Config *setting);

 

-Adds a new IPv4 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
+Returns the value contained in the "ignore-auto-dns"
+property.
 

 

 

 

 
i :
index number of the address to returnindex number of the DNS search domain to return
 

 

 
Returns :
the address at index i
+the DNS search domain at index i
 
 

 
 
 
@@ -1340,26 +1325,22 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
+TRUE if automatically configured (ie via DHCP) DNS information
+should be ignored.

 

 
 
address :
the new address to add

 
Returns :

 
-TRUE if the address was added; FALSE if the address was already
-known.
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_address ()

-
void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
+                                                        (NMSettingIP4Config *setting);

 

-Removes the address at index i.
+Returns the value contained in the "ignore-auto-routes"
+property.
 

 
@@ -1370,36 +1351,24 @@ Removes the address at index i.
 
-
-
+
+

 

 
 
i :
index number of the address to remove
Returns :

+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_clear_addresses ()

-
void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_get_may_fail ()

+
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

 

-Removes all configured addresses.
+Returns the value contained in the "may-fail"
+property.
 

 
-
-
-
-
-

 

setting :
the NMSettingIP4Config
-

-

-

-

-
nm_setting_ip4_config_get_num_routes ()

-
guint32             nm_setting_ip4_config_get_num_routes
-                                                        (NMSettingIP4Config *setting);

-

-
@@ -1408,16 +1377,17 @@ Removes all configured addresses.
 
-
+

 
 

 
setting :

 

 
Returns :
the number of configured routes
+TRUE if this connection doesn't require IPv4 addressing to complete
+for the connection to succeed.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_method ()

+
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

 

@@ -1427,25 +1397,20 @@ Removes all configured addresses.
 
-
-
-
-
-
+

 
 
 
 
i :
index number of the route to return

 
Returns :
the route at index i
-the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip4_config_add_route ()

-
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

+
nm_setting_ip4_config_get_never_default ()

+
gboolean            nm_setting_ip4_config_get_never_default
+                                                        (NMSettingIP4Config *setting);

 

-Adds a new IPv4 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
+Returns the value contained in the "never-default"
+property.
 

 
@@ -1456,25 +1421,19 @@ given route is duplicated internally and is not changed by this function.
 
-
-
-
-
+TRUE if this connection should never be the default connection
+for IPv4 addressing

 

 
 
route :
the route to add

 
Returns :

 
-TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_route ()

-
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

-Removes the route at index i.
-

+
nm_setting_ip4_config_get_num_addresses ()

+
guint32             nm_setting_ip4_config_get_num_addresses
+                                                        (NMSettingIP4Config *setting);

 

@@ -1484,37 +1443,36 @@ Removes the route at index i.
 
-
-
+
+

 
 
 
 
i :
index number of the route
Returns :
the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip4_config_clear_routes ()

-
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

-

-Removes all configured routes.
-

+
nm_setting_ip4_config_get_num_dns ()

+
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

 
-
+
+
-
+
+
+
+
+
+

 


 
setting :

 the NMSettingIP4Config
 
Returns :
the number of configured DNS servers

 

 

 

 

-
nm_setting_ip4_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
+
nm_setting_ip4_config_get_num_dns_searches ()

+
guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);

-

-Returns the value contained in the "ignore-auto-routes"
-property.
-

 

@@ -1525,22 +1483,16 @@ property.
 
-
+

 
 
 

 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.the number of configured DNS search domains
 

 
 

 

 

 

-
nm_setting_ip4_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
+
nm_setting_ip4_config_get_num_routes ()

+
guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);

-

-Returns the value contained in the "ignore-auto-dns"
-property.
-

 

@@ -1551,22 +1503,16 @@ property.
 
-
+

 
 
 

 
Returns :

-TRUE if automatically configured (ie via DHCP) DNS information
-should be ignored.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_client_id ()

-
const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "dhcp-client-id"
-property.
-

+
nm_setting_ip4_config_get_route ()

+
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

@@ -1576,21 +1522,41 @@ property.
 
+
+
+
+
-
+

 
 
 
 
i :
index number of the route to return

 
Returns :
the configured Client ID to send to the DHCP server when requesting
-addresses via DHCP.the route at index i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_send_hostname ()

-
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_new ()

+
NMSetting *         nm_setting_ip4_config_new           (void);

 

-Returns the value contained in the "dhcp-send-hostname"
-property.
+Creates a new NMSettingIP4Config object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingIP4Config object. [transfer full]
+

+

+

+

+
nm_setting_ip4_config_remove_address ()

+
void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+Removes the address at index i.
 

 
@@ -1601,23 +1567,19 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if NetworkManager should send the machine hostname to the
-DHCP server when requesting addresses to allow the server to automatically
-update DNS information for this machine.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip4_config_get_dhcp_hostname
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns ()

+
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "dhcp-hostname"
-property.
+Removes the DNS server at index i.
 

 
@@ -1628,20 +1590,20 @@ property.
 
-
-
+
+

 

 
 
Returns :
the configured hostname to send to the DHCP server
i :
index number of the DNS server to remove
 

 
 

 

 

 

-
nm_setting_ip4_config_get_never_default ()

-
gboolean            nm_setting_ip4_config_get_never_default
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns_search ()

+
void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "never-default"
-property.
+Removes the DNS search domain at index i.
 

 
@@ -1652,21 +1614,19 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if this connection should never be the default connection
-for IPv4 addressing
i :
index number of the DNS search domain
 

 
 

 

 

 

-
nm_setting_ip4_config_get_may_fail ()

-
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_route ()

+
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "may-fail"
-property.
+Removes the route at index i.
 

 
@@ -1677,10 +1637,8 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if this connection doesn't require IPv4 addressing to complete
-for the connection to succeed.
i :
index number of the route
 

 
 

@@ -1846,6 +1804,6 @@ or 'disabled' methods because there is no upstream network.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 0fe4cc5b..e0d39277 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,129 +41,118 @@
 
 

 
Synopsis

-
+
 #include <nm-setting-ip6-config.h>
 
-#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
-enum                NMSettingIP6ConfigError;
-#define             NM_TYPE_SETTING_IP6_CONFIG_ERROR
-#define             NM_SETTING_IP6_CONFIG_ERROR
-GQuark              nm_setting_ip6_config_error_quark   (void);
-#define             NM_SETTING_IP6_CONFIG_METHOD
+typedef             NMIP6Address;
+typedef             NMIP6Route;
+                    NMSettingIP6Config;
+                    NMSettingIP6ConfigClass;
+enum                NMSettingIP6ConfigError;
+#define             NM_SETTING_IP6_CONFIG_ADDRESSES
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP6_CONFIG_ADDRESSES
-#define             NM_SETTING_IP6_CONFIG_ROUTES
-#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
-#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
+#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
 #define             NM_SETTING_IP6_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
+#define             NM_SETTING_IP6_CONFIG_METHOD
 #define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
 #define             NM_SETTING_IP6_CONFIG_METHOD_DHCP
+#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 #define             NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-typedef             NMIP6Address;
-GType               nm_ip6_address_get_type             (void);
-NMIP6Address *          nm_ip6_address_new              (void);
-NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
-void                nm_ip6_address_unref                (NMIP6Address *address);
+#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
+#define             NM_SETTING_IP6_CONFIG_ROUTES
+#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
 gboolean            nm_ip6_address_compare              (NMIP6Address *address,
                                                          NMIP6Address *other);
+NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
 const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
+const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
+guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
+NMIP6Address *      nm_ip6_address_new                  (void);
+void                nm_ip6_address_ref                  (NMIP6Address *address);
 void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
 void                nm_ip6_address_set_gateway          (NMIP6Address *address,
                                                          const struct in6_addr *gateway);
-typedef             NMIP6Route;
-GType               nm_ip6_route_get_type               (void);
-NMIP6Route *            nm_ip6_route_new                (void);
-NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *source);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
+void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+                                                         guint32 prefix);
+void                nm_ip6_address_unref                (NMIP6Address *address);
 gboolean            nm_ip6_route_compare                (NMIP6Route *route,
                                                          NMIP6Route *other);
+NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
 const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
+guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
+const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
+guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
+NMIP6Route *        nm_ip6_route_new                    (void);
+void                nm_ip6_route_ref                    (NMIP6Route *route);
 void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
 void                nm_ip6_route_set_metric             (NMIP6Route *route,
                                                          guint32 metric);
-                    NMSettingIP6Config;
-                    NMSettingIP6ConfigClass;
-GType               nm_setting_ip6_config_get_type      (void);
-NMSetting *             nm_setting_ip6_config_new       (void);
-const char *            nm_setting_ip6_config_get_method
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
-const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);
+void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+                                                         const struct in6_addr *next_hop);
+void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+                                                         guint32 prefix);
+void                nm_ip6_route_unref                  (NMIP6Route *route);
+gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);
 gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
                                                          const struct in6_addr *dns);
-void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);
-const char *            nm_setting_ip6_config_get_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
 gboolean            nm_setting_ip6_config_add_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          const char *dns_search);
-void                nm_setting_ip6_config_remove_dns_search
+gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);
+void                nm_setting_ip6_config_clear_addresses
+                                                        (NMSettingIP6Config *setting);
+void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
+void                nm_setting_ip6_config_clear_dns_searches
+                                                        (NMSettingIP6Config *setting);
+void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
+GQuark              nm_setting_ip6_config_error_quark   (void);
+NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
+                                                         guint32 i);
+const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+                                                         guint32 i);
+const char *        nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
-void                nm_setting_ip6_config_clear_dns_searches
+gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_ignore_auto_routes
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
+const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_never_default
                                                         (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);
-NMIP6Address *          nm_setting_ip6_config_get_address
-                                                        (NMSettingIP6Config *setting,
+guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
+guint32             nm_setting_ip6_config_get_num_dns_searches
+                                                        (NMSettingIP6Config *setting);
+guint32             nm_setting_ip6_config_get_num_routes
+                                                        (NMSettingIP6Config *setting);
+NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
+NMSetting *         nm_setting_ip6_config_new           (void);
 void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
-void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_routes
-                                                        (NMSettingIP6Config *setting);
-NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
+void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
 void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);
-void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP6ConfigError
-

 
   GBoxed
    +----NMIP6Address
@@ -177,6 +166,10 @@ const char *            NMSetting
          +----NMSettingIP6Config
 

+
+  GEnum
+   +----NMSettingIP6ConfigError
+

 

 

 
Properties

@@ -202,15 +195,46 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 

 
Details

 

-
NM_SETTING_IP6_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
+
NMIP6Address

+
typedef struct NMIP6Address NMIP6Address;
+

+

+

+

+

+

+
NMIP6Route

+
typedef struct NMIP6Route NMIP6Route;
+

+

+

+

+

+

+
NMSettingIP6Config

+
typedef struct _NMSettingIP6Config NMSettingIP6Config;

+

+

+

+

+

+
NMSettingIP6ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP6ConfigClass;
 

 

 

 

 

 

-
enum NMSettingIP6ConfigError

+
enum NMSettingIP6ConfigError

 
typedef enum {
 	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,
 	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
@@ -248,39 +272,8 @@ not valid with the given IPv6 method
 

 

 

-
NM_TYPE_SETTING_IP6_CONFIG_ERROR

-
#define NM_TYPE_SETTING_IP6_CONFIG_ERROR (nm_setting_ip6_config_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_IP6_CONFIG_ERROR

-
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
-

-

-

-

-

-

-
nm_setting_ip6_config_error_quark ()

-
GQuark              nm_setting_ip6_config_error_quark   (void);

-

-Registers an error quark for NMSettingIP6Config if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingIP6Config errors.

-

-

-

-
NM_SETTING_IP6_CONFIG_METHOD

-
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
+
NM_SETTING_IP6_CONFIG_ADDRESSES

+
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

 

 

@@ -303,30 +296,6 @@ Registers an error quark for 
 

 

-
NM_SETTING_IP6_CONFIG_ADDRESSES

-
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
-

-

-

-

-

-

-
NM_SETTING_IP6_CONFIG_ROUTES

-
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
-

-

-

-

-

-

-
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

-
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
-

-

-

-

-

-

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

@@ -335,8 +304,8 @@ Registers an error quark for 
 

 

-
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

+
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

 

 

@@ -351,12 +320,10 @@ Registers an error quark for 
 

 

-
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

-
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
+
NM_SETTING_IP6_CONFIG_METHOD

+
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

 

-IPv6 is not required or is handled by some other mechanism, and NetworkManager
-should not configure IPv6 for this connection.
 

 

 

@@ -382,6 +349,16 @@ router advertisements should be ignored.
 

 

 

+
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

+
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
+

+

+IPv6 is not required or is handled by some other mechanism, and NetworkManager
+should not configure IPv6 for this connection.
+

+

+

+

 
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -417,114 +394,74 @@ supported for IPv6)
 

 

 

-
NMIP6Address

-
typedef struct NMIP6Address NMIP6Address;
+
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

 

 

 

 

 

-
nm_ip6_address_get_type ()

-
GType               nm_ip6_address_get_type             (void);

+
NM_SETTING_IP6_CONFIG_ROUTES

+
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
+

 

 

 

 

 

-
nm_ip6_address_new ()

-
NMIP6Address *          nm_ip6_address_new              (void);

+
NM_SETTING_IP6_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
+

 

-Creates and returns a new NMIP6Address object.
 

-

--
-
-
-
-


Returns :
the new empty NMIP6Address object. [transfer full]
-

 

 

 

-
nm_ip6_address_dup ()

-
NMIP6Address *          nm_ip6_address_dup              (NMIP6Address *source);

+
nm_ip6_address_compare ()

+
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
+                                                         NMIP6Address *other);

 

-Copies a given NMIP6Address object and returns the copy.
+Determines if two NMIP6Address objects contain the same values.
 

 

-
-
+
+
+
+
+
+
-
+

 
 
 
source :
the NMIP6Address object to copy
address :
the NMIP6Address
+
other :
the NMIP6Address to compare address to.
 

 

 
Returns :
the copy of the given NMIP6Address copy. [transfer full]
-
+TRUE if the objects contain the same values, FALSE if they do not.
 

 
 

 

 

 

-
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

-

-Increases the reference count of the object.
-

-

--
-
-
-
-


address :
the NMIP6Address
-

-

-

-

-
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

-

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
-

-

--
-
-
-
-


address :
the NMIP6Address
-

-

-

-

-
nm_ip6_address_compare ()

-
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);

+
nm_ip6_address_dup ()

+
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

 

-Determines if two NMIP6Address objects contain the same values.
+Copies a given NMIP6Address object and returns the copy.
 

 

-
-
-
-
-
-
+
+
-
+

 
 
 
address :
the NMIP6Address
-
other :
the NMIP6Address to compare address to.
source :
the NMIP6Address object to copy
 

 

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.the copy of the given NMIP6Address copy. [transfer full]
+
 

 
 

@@ -554,11 +491,10 @@ Gets the IPv6 address property of this address object.
 

 

 

-
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
-                                                         const struct in6_addr *addr);

+
nm_ip6_address_get_gateway ()

+
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

 

-Sets the IPv6 address property of this object.
+Gets the IPv6 default gateway property of this address object.
 

 
@@ -569,8 +505,9 @@ Sets the IPv6 address property of this object.
 
-
-
+
+

 

 
 
addr :
the IPv6 address
Returns :
the IPv6 gateway address. [transfer none]
+
 

 
 

@@ -599,33 +536,43 @@ Gets the IPv6 address prefix property of this address object.
 

 

 

-
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);

+
nm_ip6_address_new ()

+
NMIP6Address *      nm_ip6_address_new                  (void);

 

-Sets the IPv6 address prefix.
+Creates and returns a new NMIP6Address object.
 

 
-
-
+
+
+
+
+

 

Returns :
the new empty NMIP6Address object. [transfer full]
+

+

+

+

+
nm_ip6_address_ref ()

+
void                nm_ip6_address_ref                  (NMIP6Address *address);

+

+Increases the reference count of the object.
+

+

++
-
-
-
-
-
-
+



 
address :

 the NMIP6Address
 
prefix :
the address prefix, a number between 0 and 128 inclusive

 

 

 

 

-
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

+
nm_ip6_address_set_address ()

+
void                nm_ip6_address_set_address          (NMIP6Address *address,
+                                                         const struct in6_addr *addr);

 

-Gets the IPv6 default gateway property of this address object.
+Sets the IPv6 address property of this object.
 

 
@@ -636,9 +583,8 @@ Gets the IPv6 default gateway property of this address object.
 
-
-
+
+

 

 
 
Returns :
the IPv6 gateway address. [transfer none]
-
addr :
the IPv6 address
 

 
 

@@ -668,77 +614,31 @@ Sets the IPv6 default gateway property of this address object.
 

 

 

-
NMIP6Route

-
typedef struct NMIP6Route NMIP6Route;
-

-

-

-

-

-

-
nm_ip6_route_get_type ()

-
GType               nm_ip6_route_get_type               (void);

-

-

-

-

-

-
nm_ip6_route_new ()

-
NMIP6Route *            nm_ip6_route_new                (void);

-

-Creates and returns a new NMIP6Route object.
-

-

--
-
-
-
-


Returns :
the new empty NMIP6Route object. [transfer full]
-

-

-

-

-
nm_ip6_route_dup ()

-
NMIP6Route *            nm_ip6_route_dup                (NMIP6Route *source);

+
nm_ip6_address_set_prefix ()

+
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+                                                         guint32 prefix);

 

-Copies a given NMIP6Route object and returns the copy.
+Sets the IPv6 address prefix.
 

 

-
-
+
+
-
-
+
+

 
 
 
source :
the NMIP6Route object to copy
address :
the NMIP6Address
+
 

 
Returns :
the copy of the given NMIP6Route copy. [transfer full]
-
prefix :
the address prefix, a number between 0 and 128 inclusive
 

 
 

 

 

 

-
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

-

-Increases the reference count of the object.
-

-

--
-
-
-
-


route :
the NMIP6Route
-

-

-

-

-
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

+
nm_ip6_address_unref ()

+
void                nm_ip6_address_unref                (NMIP6Address *address);

 

 Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.
@@ -746,8 +646,8 @@ reaches zero, the object will be destroyed.
 

-
-
+

 
 
route :
the NMIP6Route
+
address :
the NMIP6Address
 
 

 

@@ -782,33 +682,32 @@ Determines if two 
 

 

-
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

+
nm_ip6_route_dup ()

+
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

 

-Gets the IPv6 destination address property of this route object.
+Copies a given NMIP6Route object and returns the copy.
 

 

-
-
+
+
-
+

 
 
 
route :
the NMIP6Route
-
source :
the NMIP6Route object to copy
 

 

 
Returns :
the IPv6 addressthe copy of the given NMIP6Route copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
-                                                         const struct in6_addr *dest);

+
nm_ip6_route_get_dest ()

+
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

 

-Sets the IPv6 destination address property of this route object.
+Gets the IPv6 destination address property of this route object.
 

 
@@ -819,18 +718,19 @@ Sets the IPv6 destination address property of this route object.
 
-
-
+
+

 

 
 
dest :
the destination address
Returns :
the IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

+
nm_ip6_route_get_metric ()

+
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

 

-Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

 
@@ -842,18 +742,17 @@ Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 
-
+

 

 

 
Returns :
the IPv6 prefixthe route metric
 

 
 

 

 

 

-
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);

+
nm_ip6_route_get_next_hop ()

+
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

 

-Sets the IPv6 prefix of this route.
+Gets the IPv6 address of the next hop of this route.
 

 
@@ -864,18 +763,18 @@ Sets the IPv6 prefix of this route.
 
-
-
+
+

 

 
 
prefix :
the prefix, a number between 1 and 128 inclusive
Returns :
the IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

+
nm_ip6_route_get_prefix ()

+
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

 

-Gets the IPv6 address of the next hop of this route.
+Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 

 
@@ -887,41 +786,50 @@ Gets the IPv6 address of the next hop of this route.
 
-
+

 

 

 
Returns :
the IPv6 addressthe IPv6 prefix
 

 
 

 

 

 

-
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);

+
nm_ip6_route_new ()

+
NMIP6Route *        nm_ip6_route_new                    (void);

 

-Sets the IPv6 address of the next hop of this route.
+Creates and returns a new NMIP6Route object.
 

 
-
-
+
+
+
+
+

 

Returns :
the new empty NMIP6Route object. [transfer full]
+

+

+

+

+
nm_ip6_route_ref ()

+
void                nm_ip6_route_ref                    (NMIP6Route *route);

+

+Increases the reference count of the object.
+

+

++
-
-
-
-
-
-
+



 
route :

 the NMIP6Route
 
next_hop :
the IPv6 address of the next hop

 

 

 

 

-
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

+
nm_ip6_route_set_dest ()

+
void                nm_ip6_route_set_dest               (NMIP6Route *route,
+                                                         const struct in6_addr *dest);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Sets the IPv6 destination address property of this route object.
 

 
@@ -932,8 +840,8 @@ Gets the route metric property of this route object; lower values indicate
 
-
-
+
+

 

 
 
Returns :
the route metric
dest :
the destination address
 

 
 

@@ -964,55 +872,76 @@ Sets the route metric property of this route object; lower values indicate
 

 

 

-
NMSettingIP6Config

-
typedef struct _NMSettingIP6Config NMSettingIP6Config;

-

-

-

-

-

-
NMSettingIP6ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP6ConfigClass;
-

+
nm_ip6_route_set_next_hop ()

+
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+                                                         const struct in6_addr *next_hop);

 

+Sets the IPv6 address of the next hop of this route.
 

+

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


route :
the NMIP6Route
+
next_hop :
the IPv6 address of the next hop

 

 

 

-
nm_setting_ip6_config_get_type ()

-
GType               nm_setting_ip6_config_get_type      (void);

+
nm_ip6_route_set_prefix ()

+
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+                                                         guint32 prefix);

 

+Sets the IPv6 prefix of this route.
 

+

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


route :
the NMIP6Route
+
prefix :
the prefix, a number between 1 and 128 inclusive

 

 

 

-
nm_setting_ip6_config_new ()

-
NMSetting *             nm_setting_ip6_config_new       (void);

+
nm_ip6_route_unref ()

+
void                nm_ip6_route_unref                  (NMIP6Route *route);

 

-Creates a new NMSettingIP6Config object with default values.
+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

 

-
-
+

 
 
Returns :
the new empty NMSettingIP6Config object. [transfer full]
+
route :
the NMIP6Route
 
 

 

 

 

 

-
nm_setting_ip6_config_get_method ()

-
const char *            nm_setting_ip6_config_get_method
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_address ()

+
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);

+

+Adds a new IPv6 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
+

 

@@ -1022,16 +951,26 @@ Creates a new address :

+
+
+
-
+

 
 
the new address to add

 
Returns :
the "method" property of the setting
+TRUE if the address was added; FALSE if the address was already
+known.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_num_dns ()

-
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_dns ()

+
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
+                                                         const struct in6_addr *dns);

+

+Adds a new DNS server to the setting.
+

 

@@ -1041,17 +980,27 @@ Creates a new dns :

+
+
+
-
+

 
 
the IPv6 address of the DNS server to add

 
Returns :
the number of configured DNS servers
+TRUE if the DNS server was added; FALSE if the server was already
+known
 

 
 

 

 

 

-
nm_setting_ip6_config_get_dns ()

-
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_add_dns_search ()

+
gboolean            nm_setting_ip6_config_add_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         const char *dns_search);

+

+Adds a new DNS search domain to the setting.
+

 

@@ -1061,24 +1010,26 @@ Creates a new i :

-
+
+
-
+

 
 
index number of the DNS server to return
dns_search :
the search domain to add
 

 

 
Returns :
the IPv6 address of the DNS server at index i. [transfer none]
-
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip6_config_add_dns ()

-
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
-                                                         const struct in6_addr *dns);

+
nm_setting_ip6_config_add_route ()

+
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);

 

-Adds a new DNS server to the setting.
+Adds a new IPv6 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

 
@@ -1089,39 +1040,32 @@ Adds a new DNS server to the setting.
 
-
-
+
+
+TRUE if the route was added; FALSE if the route was already known.

 

 
 
dns :
the IPv6 address of the DNS server to add
route :
the route to add
 

 

 
Returns :

 
-TRUE if the DNS server was added; FALSE if the server was already
-known
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_dns ()

-
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_clear_addresses ()

+
void                nm_setting_ip6_config_clear_addresses
+                                                        (NMSettingIP6Config *setting);

 

-Removes the DNS server at index i.
+Removes all configured addresses.
 

 
-
-
+
-
-
-
-
-
-
+

 


 
setting :

 the NMSettingIP6Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1137,14 +1081,87 @@ Removes all configured DNS servers.
 
setting :

 the NMSettingIP6Config
 
-
+
+

+

+

+

+
nm_setting_ip6_config_clear_dns_searches ()

+
void                nm_setting_ip6_config_clear_dns_searches
+                                                        (NMSettingIP6Config *setting);

+

+Removes all configured DNS search domains.
+

+

++
+
+
+
+


setting :
the NMSettingIP6Config
+

+

+

+

+
nm_setting_ip6_config_clear_routes ()

+
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

+

+Removes all configured routes.
+

+

++
+
+
+
+


setting :
the NMSettingIP6Config
+

+

+

+

+
nm_setting_ip6_config_error_quark ()

+
GQuark              nm_setting_ip6_config_error_quark   (void);

+

+Registers an error quark for NMSettingIP6Config if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingIP6Config errors.

+

+

+

+
nm_setting_ip6_config_get_address ()

+
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

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


setting :
the NMSettingIP6Config
+
i :
index number of the address to return
Returns :
the address at index i
+

 

 

 

 

-
nm_setting_ip6_config_get_num_dns_searches ()

-
guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_get_dns ()

+
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

@@ -1154,8 +1171,13 @@ Removes all configured DNS servers.
 
+
+
+
+
-
+

 
 
 
 
i :
index number of the DNS server to return

 
Returns :
the number of configured DNS search domainsthe IPv6 address of the DNS server at index i. [transfer none]
+
 

 
 

@@ -1163,7 +1185,7 @@ Removes all configured DNS servers.
 

 

 
nm_setting_ip6_config_get_dns_search ()

-
const char *            nm_setting_ip6_config_get_dns_search
+
const char *        nm_setting_ip6_config_get_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);

 

@@ -1188,12 +1210,12 @@ Removes all configured DNS servers.
 

-
nm_setting_ip6_config_add_dns_search ()

-
gboolean            nm_setting_ip6_config_add_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         const char *dns_search);

+
nm_setting_ip6_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);

 

-Adds a new DNS search domain to the setting.
+Returns the value contained in the "ignore-auto-dns"
+property.
 

 

 
 
@@ -1204,26 +1226,22 @@ Adds a new DNS search domain to the setting.
 
-
-
-
-
+TRUE if automatically configured (ie via DHCP or router
+advertisements) DNS information should be ignored.

 

 
 
dns_search :
the search domain to add

 
Returns :

 
-TRUE if the DNS search domain was added; FALSE if the search
-domain was already known
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_dns_search ()

-
void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
+                                                        (NMSettingIP6Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "ignore-auto-routes"
+property.
 

 
@@ -1234,36 +1252,24 @@ Removes the DNS search domain at index i
-
-
+
+

 

 
 
 
i :
index number of the DNS search domain
Returns :

+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_clear_dns_searches ()

-
void                nm_setting_ip6_config_clear_dns_searches
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_get_may_fail ()

+
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

-Removes all configured DNS search domains.
+Returns the value contained in the "may-fail"
+property.
 

 
-
-
-
-
-

 

setting :
the NMSettingIP6Config
-

-

-

-

-
nm_setting_ip6_config_get_num_addresses ()

-
guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);

-

-
@@ -1272,17 +1278,17 @@ Removes all configured DNS search domains.
 
-
+

 
 

 
setting :

 

 
Returns :
the number of configured addresses
+TRUE if this connection doesn't require IPv6 addressing to complete
+for the connection to succeed.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_address ()

-
NMIP6Address *          nm_setting_ip6_config_get_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_method ()

+
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

 

@@ -1292,25 +1298,20 @@ Removes all configured DNS search domains.
 
-
-
-
-
-
+

 
 
 
 
i :
index number of the address to return

 
Returns :
the address at index i
-the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip6_config_add_address ()

-
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

+
nm_setting_ip6_config_get_never_default ()

+
gboolean            nm_setting_ip6_config_get_never_default
+                                                        (NMSettingIP6Config *setting);

 

-Adds a new IPv6 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
+Returns the value contained in the "never-default"
+property.
 

 
@@ -1321,27 +1322,19 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
+TRUE if this connection should never be the default connection
+for IPv6 addressing

 

 
 
address :
the new address to add

 
Returns :

 
-TRUE if the address was added; FALSE if the address was already
-known.
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_address ()

-
void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

-Removes the address at index i.
-

+
nm_setting_ip6_config_get_num_addresses ()

+
guint32             nm_setting_ip6_config_get_num_addresses
+                                                        (NMSettingIP6Config *setting);

 

@@ -1351,34 +1344,16 @@ Removes the address at index i.
 
-
-
+
+

 
 
 
 
i :
index number of the address to remove
Returns :
the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip6_config_clear_addresses ()

-
void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);

-

-Removes all configured addresses.
-

-

--
-
-
-
-


setting :
the NMSettingIP6Config
-

-

-

-

-
nm_setting_ip6_config_get_num_routes ()

-
guint32             nm_setting_ip6_config_get_num_routes
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_get_num_dns ()

+
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

 

@@ -1389,16 +1364,16 @@ Removes all configured addresses.
 
-
+

 
 
 

 
Returns :
the number of configured routesthe number of configured DNS servers
 

 
 

 

 

 

-
nm_setting_ip6_config_get_route ()

-
NMIP6Route *            nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_num_dns_searches ()

+
guint32             nm_setting_ip6_config_get_num_dns_searches
+                                                        (NMSettingIP6Config *setting);

 

@@ -1408,26 +1383,17 @@ Removes all configured addresses.
 
-
-
-
-
-
+

 
 
 
 
i :
index number of the route to return

 
Returns :
the route at index i
-the number of configured DNS search domains
 

 
 

 

 

 

-
nm_setting_ip6_config_add_route ()

-
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

-

-Adds a new IPv6 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
-

+
nm_setting_ip6_config_get_num_routes ()

+
guint32             nm_setting_ip6_config_get_num_routes
+                                                        (NMSettingIP6Config *setting);

 

@@ -1437,25 +1403,17 @@ given route is duplicated internally and is not changed by this function.
 
-
-
-
-
-
+

 
 
 
 
route :
the route to add

 
Returns :

-TRUE if the route was added; FALSE if the route was already known.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_route ()

-
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
+
nm_setting_ip6_config_get_route ()

+
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);

-

-Removes the route at index i.
-

 

@@ -1466,35 +1424,40 @@ Removes the route at index i.
 
-
+
+
+
+
+

 
 
 

 
i :
index number of the routeindex number of the route to return
Returns :
the route at index i
+
 

 
 

 

 

 

-
nm_setting_ip6_config_clear_routes ()

-
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_new ()

+
NMSetting *         nm_setting_ip6_config_new           (void);

 

-Removes all configured routes.
+Creates a new NMSettingIP6Config object with default values.
 

 

-
-
+

 
 
setting :
the NMSettingIP6Config
+
Returns :
the new empty NMSettingIP6Config object. [transfer full]
 
 

 

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_address ()

+
void                nm_setting_ip6_config_remove_address
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-routes"
-property.
+Removes the address at index i.
 

 
@@ -1505,22 +1468,19 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns ()

+
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-dns"
-property.
+Removes the DNS server at index i.
 

 
@@ -1531,22 +1491,20 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if automatically configured (ie via DHCP or router
-advertisements) DNS information should be ignored.
i :
index number of the DNS server to remove
 

 
 

 

 

 

-
nm_setting_ip6_config_get_never_default ()

-
gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns_search ()

+
void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "never-default"
-property.
+Removes the DNS search domain at index i.
 

 
@@ -1557,21 +1515,19 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if this connection should never be the default connection
-for IPv6 addressing
i :
index number of the DNS search domain
 

 
 

 

 

 

-
nm_setting_ip6_config_get_may_fail ()

-
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_route ()

+
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "may-fail"
-property.
+Removes the route at index i.
 

 
@@ -1582,10 +1538,8 @@ property.
 
-
-
+
+

 

 
 
Returns :

-TRUE if this connection doesn't require IPv6 addressing to complete
-for the connection to succeed.
i :
index number of the route
 

 
 

@@ -1720,6 +1674,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 03a1fd22..1f24e2a5 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,35 +41,32 @@
 

 

 
Synopsis

-
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-enum                NMSettingOlpcMeshError;
-#define             NM_TYPE_SETTING_OLPC_MESH_ERROR
-#define             NM_SETTING_OLPC_MESH_ERROR
-GQuark              nm_setting_olpc_mesh_error_quark    (void);
-#define             NM_SETTING_OLPC_MESH_SSID
+
                    NMSettingOlpcMesh;
+                    NMSettingOlpcMeshClass;
+enum                NMSettingOlpcMeshError;
 #define             NM_SETTING_OLPC_MESH_CHANNEL
 #define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-                    NMSettingOlpcMesh;
-                    NMSettingOlpcMeshClass;
-GType               nm_setting_olpc_mesh_get_type       (void);
-NMSetting *         nm_setting_olpc_mesh_new            (void);
-const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
+#define             NM_SETTING_OLPC_MESH_SETTING_NAME
+#define             NM_SETTING_OLPC_MESH_SSID
+GQuark              nm_setting_olpc_mesh_error_quark    (void);
 guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);
 const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (NMSettingOlpcMesh *setting);
+const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
+NMSetting *         nm_setting_olpc_mesh_new            (void);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingOlpcMeshError
-

 
   GObject
    +----NMSetting
          +----NMSettingOlpcMesh
 

+
+  GEnum
+   +----NMSettingOlpcMeshError
+

 

 

 
Properties

@@ -87,17 +84,31 @@ const 
 
Details

 

-
NM_SETTING_OLPC_MESH_SETTING_NAME

-
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
+
NMSettingOlpcMesh

+
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

+

+

+

+

+

+
NMSettingOlpcMeshClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingOlpcMeshClass;
 

 

 

 

 

 

-
enum NMSettingOlpcMeshError

-
typedef enum
-{
+
enum NMSettingOlpcMeshError

+
typedef enum {
 	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,
 	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
 	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
@@ -108,24 +119,25 @@ const 
-
NM_TYPE_SETTING_OLPC_MESH_ERROR

-
#define NM_TYPE_SETTING_OLPC_MESH_ERROR (nm_setting_olpc_mesh_error_get_type ()) 
+
NM_SETTING_OLPC_MESH_CHANNEL

+
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

 

 

 

 

 

-
NM_SETTING_OLPC_MESH_ERROR

-
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

+
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

 

 

 

 

 

-
nm_setting_olpc_mesh_error_quark ()

-
GQuark              nm_setting_olpc_mesh_error_quark    (void);

+
NM_SETTING_OLPC_MESH_SETTING_NAME

+
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
+

 

 

 

@@ -139,47 +151,30 @@ const 
-
NM_SETTING_OLPC_MESH_CHANNEL

-
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
-

-

-

-

-

-

-
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

-
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
-

+
nm_setting_olpc_mesh_error_quark ()

+
GQuark              nm_setting_olpc_mesh_error_quark    (void);

 

 

 

 

 

-
NMSettingOlpcMesh

-
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

+
nm_setting_olpc_mesh_get_channel ()

+
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

 

 

 

 

 

-
NMSettingOlpcMeshClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingOlpcMeshClass;
-

+
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

+
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
+                                                        (NMSettingOlpcMesh *setting);

 

 

 

 

 

-
nm_setting_olpc_mesh_get_type ()

-
GType               nm_setting_olpc_mesh_get_type       (void);

+
nm_setting_olpc_mesh_get_ssid ()

+
const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);

 

 

 

@@ -198,28 +193,6 @@ Creates a new 
-
nm_setting_olpc_mesh_get_ssid ()

-
const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);

-

-

-

-

-

-
nm_setting_olpc_mesh_get_channel ()

-
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

-

-

-

-

-

-
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

-
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
-                                                        (NMSettingOlpcMesh *setting);

-

-

-

 

 

 
Property Details

@@ -253,6 +226,6 @@ SSID of the mesh network to join.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index ea9a7c78..c1d73ead 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -45,65 +45,62 @@ that require PPP to deliver IP capability

 
 #include <nm-setting-ppp.h>
 
-#define             NM_SETTING_PPP_SETTING_NAME
-enum                NMSettingPPPError;
-#define             NM_TYPE_SETTING_PPP_ERROR
-#define             NM_SETTING_PPP_ERROR
-GQuark              nm_setting_ppp_error_quark          (void);
+                    NMSettingPPP;
+                    NMSettingPPPClass;
+enum                NMSettingPPPError;
+#define             NM_SETTING_PPP_BAUD
+#define             NM_SETTING_PPP_CRTSCTS
+#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
+#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
+#define             NM_SETTING_PPP_MPPE_STATEFUL
+#define             NM_SETTING_PPP_MRU
+#define             NM_SETTING_PPP_MTU
 #define             NM_SETTING_PPP_NOAUTH
-#define             NM_SETTING_PPP_REFUSE_EAP
-#define             NM_SETTING_PPP_REFUSE_PAP
-#define             NM_SETTING_PPP_REFUSE_CHAP
-#define             NM_SETTING_PPP_REFUSE_MSCHAP
-#define             NM_SETTING_PPP_REFUSE_MSCHAPV2
 #define             NM_SETTING_PPP_NOBSDCOMP
 #define             NM_SETTING_PPP_NODEFLATE
 #define             NM_SETTING_PPP_NO_VJ_COMP
+#define             NM_SETTING_PPP_REFUSE_CHAP
+#define             NM_SETTING_PPP_REFUSE_EAP
+#define             NM_SETTING_PPP_REFUSE_MSCHAP
+#define             NM_SETTING_PPP_REFUSE_MSCHAPV2
+#define             NM_SETTING_PPP_REFUSE_PAP
 #define             NM_SETTING_PPP_REQUIRE_MPPE
 #define             NM_SETTING_PPP_REQUIRE_MPPE_128
-#define             NM_SETTING_PPP_MPPE_STATEFUL
-#define             NM_SETTING_PPP_CRTSCTS
-#define             NM_SETTING_PPP_BAUD
-#define             NM_SETTING_PPP_MRU
-#define             NM_SETTING_PPP_MTU
-#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
-#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
-                    NMSettingPPP;
-                    NMSettingPPPClass;
-GType               nm_setting_ppp_get_type             (void);
-NMSetting *         nm_setting_ppp_new                  (void);
+#define             NM_SETTING_PPP_SETTING_NAME
+GQuark              nm_setting_ppp_error_quark          (void);
+guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);
+NMSetting *         nm_setting_ppp_new                  (void);
 

 
 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPError
-

 
   GObject
    +----NMSetting
          +----NMSettingPPP
 

+
+  GEnum
+   +----NMSettingPPPError
+

 

 

 
Properties

@@ -139,15 +136,30 @@ cable and DSL modems and some mobile broadband devices.
 

 
Details

 

-
NM_SETTING_PPP_SETTING_NAME

-
#define NM_SETTING_PPP_SETTING_NAME "ppp"
+
NMSettingPPP

+
typedef struct _NMSettingPPP NMSettingPPP;

+

+

+

+

+

+
NMSettingPPPClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPClass;
 

 

 

 

 

 

-
enum NMSettingPPPError

+
enum NMSettingPPPError

 
typedef enum {
 	NM_SETTING_PPP_ERROR_UNKNOWN = 0,
 	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
@@ -185,79 +197,64 @@ with other setting configuration parameters
 

 

 

-
NM_TYPE_SETTING_PPP_ERROR

-
#define NM_TYPE_SETTING_PPP_ERROR (nm_setting_ppp_error_get_type ()) 
+
NM_SETTING_PPP_BAUD

+
#define NM_SETTING_PPP_BAUD              "baud"
 

 

 

 

 

 

-
NM_SETTING_PPP_ERROR

-
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+
NM_SETTING_PPP_CRTSCTS

+
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

 

 

 

 

 

-
nm_setting_ppp_error_quark ()

-
GQuark              nm_setting_ppp_error_quark          (void);

-

-Registers an error quark for NMSettingPPP if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingPPP errors.

-

-

-

-
NM_SETTING_PPP_NOAUTH

-
#define NM_SETTING_PPP_NOAUTH            "noauth"
+
NM_SETTING_PPP_LCP_ECHO_FAILURE

+
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_EAP

-
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
+
NM_SETTING_PPP_LCP_ECHO_INTERVAL

+
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_PAP

-
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
+
NM_SETTING_PPP_MPPE_STATEFUL

+
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_CHAP

-
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
+
NM_SETTING_PPP_MRU

+
#define NM_SETTING_PPP_MRU               "mru"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAP

-
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
+
NM_SETTING_PPP_MTU

+
#define NM_SETTING_PPP_MTU               "mtu"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAPV2

-
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
+
NM_SETTING_PPP_NOAUTH

+
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

 

 

@@ -288,161 +285,144 @@ Registers an error quark for 
-
NM_SETTING_PPP_REQUIRE_MPPE

-
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
-

-

-

-

-

-

-
NM_SETTING_PPP_REQUIRE_MPPE_128

-
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
+
NM_SETTING_PPP_REFUSE_CHAP

+
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MPPE_STATEFUL

-
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
+
NM_SETTING_PPP_REFUSE_EAP

+
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

 

 

 

 

 

-
NM_SETTING_PPP_CRTSCTS

-
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
+
NM_SETTING_PPP_REFUSE_MSCHAP

+
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

 

 

 

 

 

-
NM_SETTING_PPP_BAUD

-
#define NM_SETTING_PPP_BAUD              "baud"
+
NM_SETTING_PPP_REFUSE_MSCHAPV2

+
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

 

 

 

 

 

-
NM_SETTING_PPP_MRU

-
#define NM_SETTING_PPP_MRU               "mru"
+
NM_SETTING_PPP_REFUSE_PAP

+
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MTU

-
#define NM_SETTING_PPP_MTU               "mtu"
+
NM_SETTING_PPP_REQUIRE_MPPE

+
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_FAILURE

-
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
+
NM_SETTING_PPP_REQUIRE_MPPE_128

+
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_INTERVAL

-
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
+
NM_SETTING_PPP_SETTING_NAME

+
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

 

 

 

 

 

-
NMSettingPPP

-
typedef struct _NMSettingPPP NMSettingPPP;

+
nm_setting_ppp_error_quark ()

+
GQuark              nm_setting_ppp_error_quark          (void);

 

+Registers an error quark for NMSettingPPP if necessary.
 

+

++
+
+
+
+


Returns :
the error quark used for NMSettingPPP errors.

 

 

 

-
NMSettingPPPClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPClass;
-

+
nm_setting_ppp_get_baud ()

+
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_type ()

-
GType               nm_setting_ppp_get_type             (void);

+
nm_setting_ppp_get_crtscts ()

+
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_new ()

-
NMSetting *         nm_setting_ppp_new                  (void);

+
nm_setting_ppp_get_lcp_echo_failure ()

+
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

 

-Creates a new NMSettingPPP object with default values.
 

-

--
-
-
-
-


Returns :
the new empty NMSettingPPP object. [transfer full]
-

 

 

 

-
nm_setting_ppp_get_noauth ()

-
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

+
nm_setting_ppp_get_lcp_echo_interval ()

+
guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_refuse_eap ()

-
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

+
nm_setting_ppp_get_mppe_stateful ()

+
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_refuse_pap ()

-
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

+
nm_setting_ppp_get_mru ()

+
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_refuse_chap ()

-
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

+
nm_setting_ppp_get_mtu ()

+
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_refuse_mschap ()

-
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

+
nm_setting_ppp_get_no_vj_comp ()

+
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

+
nm_setting_ppp_get_noauth ()

+
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

 

 

 

@@ -462,74 +442,68 @@ Creates a new 
 

 

-
nm_setting_ppp_get_no_vj_comp ()

-
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

-

-

-

-

-

-
nm_setting_ppp_get_require_mppe ()

-
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

-

-

-

-

-

-
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

+
nm_setting_ppp_get_refuse_chap ()

+
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_mppe_stateful ()

-
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

+
nm_setting_ppp_get_refuse_eap ()

+
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_crtscts ()

-
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

+
nm_setting_ppp_get_refuse_mschap ()

+
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_baud ()

-
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

+
nm_setting_ppp_get_refuse_mschapv2 ()

+
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_mru ()

-
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

+
nm_setting_ppp_get_refuse_pap ()

+
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_mtu ()

-
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

+
nm_setting_ppp_get_require_mppe ()

+
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

+
nm_setting_ppp_get_require_mppe_128 ()

+
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

 

 

 

 

 

-
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);

+
nm_setting_ppp_new ()

+
NMSetting *         nm_setting_ppp_new                  (void);

 

+Creates a new NMSettingPPP object with default values.
 

+

++
+
+
+
+


Returns :
the new empty NMSettingPPP object. [transfer full]
+

 

 

 

@@ -721,6 +695,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 6ea0af49..43c795db 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,37 +44,34 @@
 
 #include <nm-setting-pppoe.h>
 
-#define             NM_SETTING_PPPOE_SETTING_NAME
-enum                NMSettingPPPOEError;
-#define             NM_TYPE_SETTING_PPPOE_ERROR
-#define             NM_SETTING_PPPOE_ERROR
-GQuark              nm_setting_pppoe_error_quark        (void);
-#define             NM_SETTING_PPPOE_SERVICE
-#define             NM_SETTING_PPPOE_USERNAME
-#define             NM_SETTING_PPPOE_PASSWORD
-#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
                     NMSettingPPPOE;
                     NMSettingPPPOEClass;
-GType               nm_setting_pppoe_get_type           (void);
-NMSetting *         nm_setting_pppoe_new                (void);
-const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
+enum                NMSettingPPPOEError;
+#define             NM_SETTING_PPPOE_PASSWORD
+#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
+#define             NM_SETTING_PPPOE_SERVICE
+#define             NM_SETTING_PPPOE_SETTING_NAME
+#define             NM_SETTING_PPPOE_USERNAME
+GQuark              nm_setting_pppoe_error_quark        (void);
 const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
-NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
+NMSettingSecretFlags nm_setting_pppoe_get_password_flags
                                                         (NMSettingPPPOE *setting);
+const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
+const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
+NMSetting *         nm_setting_pppoe_new                (void);
 

 
 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPOEError
-

 
   GObject
    +----NMSetting
          +----NMSettingPPPOE
 

+
+  GEnum
+   +----NMSettingPPPOEError
+

 

 

 
Properties

@@ -96,15 +93,30 @@ to provide IP transport, for example cable or DSL modems.
 

 
Details

 

-
NM_SETTING_PPPOE_SETTING_NAME

-
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
+
NMSettingPPPOE

+
typedef struct _NMSettingPPPOE NMSettingPPPOE;

+

+

+

+

+

+
NMSettingPPPOEClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPOEClass;
 

 

 

 

 

 

-
enum NMSettingPPPOEError

+
enum NMSettingPPPOEError

 
typedef enum {
 	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,
 	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
@@ -142,37 +154,22 @@ did not contain a required PPP setting for PPP related options
 

 

 

-
NM_TYPE_SETTING_PPPOE_ERROR

-
#define NM_TYPE_SETTING_PPPOE_ERROR (nm_setting_pppoe_error_get_type ()) 
+
NM_SETTING_PPPOE_PASSWORD

+
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_ERROR

-
#define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
+
NM_SETTING_PPPOE_PASSWORD_FLAGS

+
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

 

-
nm_setting_pppoe_error_quark ()

-
GQuark              nm_setting_pppoe_error_quark        (void);

-

-Registers an error quark for NMSettingPPPOE if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingPPPOE errors.

-

-

-

 
NM_SETTING_PPPOE_SERVICE

 
#define NM_SETTING_PPPOE_SERVICE        "service"
 

@@ -181,72 +178,61 @@ Registers an error quark for 
-
NM_SETTING_PPPOE_USERNAME

-
#define NM_SETTING_PPPOE_USERNAME       "username"
-

-

-

-

-

-

-
NM_SETTING_PPPOE_PASSWORD

-
#define NM_SETTING_PPPOE_PASSWORD       "password"
+
NM_SETTING_PPPOE_SETTING_NAME

+
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_PASSWORD_FLAGS

-
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_PPPOE_USERNAME

+
#define NM_SETTING_PPPOE_USERNAME       "username"
 

 

 

 

 

 

-
NMSettingPPPOE

-
typedef struct _NMSettingPPPOE NMSettingPPPOE;

-

-

-

-

-

-
NMSettingPPPOEClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPOEClass;
-

+
nm_setting_pppoe_error_quark ()

+
GQuark              nm_setting_pppoe_error_quark        (void);

 

+Registers an error quark for NMSettingPPPOE if necessary.
 

+

++
+
+
+
+


Returns :
the error quark used for NMSettingPPPOE errors.

 

 

 

-
nm_setting_pppoe_get_type ()

-
GType               nm_setting_pppoe_get_type           (void);

+
nm_setting_pppoe_get_password ()

+
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

 

 

 

 

 

-
nm_setting_pppoe_new ()

-
NMSetting *         nm_setting_pppoe_new                (void);

-

-Creates a new NMSettingPPPOE object with default values.
-

+
nm_setting_pppoe_get_password_flags ()

+
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+                                                        (NMSettingPPPOE *setting);

 
-
+
+
+
+
+
+
-
-
+
+

 

setting :
the NMSettingPPPOE
+

 
Returns :
the new empty NMSettingPPPOE object. [transfer full]
+the NMSettingSecretFlags pertaining to the "password"
 

 

 

 

@@ -277,30 +263,18 @@ Creates a new 
 

 

 

-
nm_setting_pppoe_get_password ()

-
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

+
nm_setting_pppoe_new ()

+
NMSetting *         nm_setting_pppoe_new                (void);

 

+Creates a new NMSettingPPPOE object with default values.
 

-

-

-

-
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags  nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);

 
-
-
-
-
-
-
+
-
-
-
+

 

setting :
the NMSettingPPPOE
-

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
+the new empty NMSettingPPPOE object. [transfer full]
 

 

 

 

@@ -349,6 +323,6 @@ Username used to authenticate with the PPPoE service.
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 0340eb26..e3d2b43d 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -45,38 +45,35 @@ serial communications

 
 #include <nm-setting-serial.h>
 
-#define             NM_SETTING_SERIAL_SETTING_NAME
-enum                NMSettingSerialError;
-#define             NM_TYPE_SETTING_SERIAL_ERROR
-#define             NM_SETTING_SERIAL_ERROR
-GQuark              nm_setting_serial_error_quark       (void);
+                    NMSettingSerial;
+                    NMSettingSerialClass;
+enum                NMSettingSerialError;
 #define             NM_SETTING_SERIAL_BAUD
 #define             NM_SETTING_SERIAL_BITS
 #define             NM_SETTING_SERIAL_PARITY
-#define             NM_SETTING_SERIAL_STOPBITS
 #define             NM_SETTING_SERIAL_SEND_DELAY
-                    NMSettingSerial;
-                    NMSettingSerialClass;
-GType               nm_setting_serial_get_type          (void);
-NMSetting *         nm_setting_serial_new               (void);
+#define             NM_SETTING_SERIAL_SETTING_NAME
+#define             NM_SETTING_SERIAL_STOPBITS
+GQuark              nm_setting_serial_error_quark       (void);
 guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);
 guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);
 char                nm_setting_serial_get_parity        (NMSettingSerial *setting);
-guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);
 guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
+guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);
+NMSetting *         nm_setting_serial_new               (void);
 

 
 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingSerialError
-

 
   GObject
    +----NMSetting
          +----NMSettingSerial
 

+
+  GEnum
+   +----NMSettingSerialError
+

 

 

 
Properties

@@ -99,15 +96,30 @@ such as mobile broadband or analog telephone connections.
 

 
Details

 

-
NM_SETTING_SERIAL_SETTING_NAME

-
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
+
NMSettingSerial

+
typedef struct _NMSettingSerial NMSettingSerial;

+

+

+

+

+

+
NMSettingSerialClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingSerialClass;
 

 

 

 

 

 

-
enum NMSettingSerialError

+
enum NMSettingSerialError

 
typedef enum {
 	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,
 	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,
@@ -145,37 +157,6 @@ setting requires the connection to contain an 
-
NM_TYPE_SETTING_SERIAL_ERROR

-
#define NM_TYPE_SETTING_SERIAL_ERROR (nm_setting_serial_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_SERIAL_ERROR

-
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
-

-

-

-

-

-

-
nm_setting_serial_error_quark ()

-
GQuark              nm_setting_serial_error_quark       (void);

-

-Registers an error quark for NMSettingSerial if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingSerial errors.

-

-

-

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -200,14 +181,6 @@ Registers an error quark for 
-
NM_SETTING_SERIAL_STOPBITS

-
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
-

-

-

-

-

-

 
NM_SETTING_SERIAL_SEND_DELAY

 
#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 

@@ -216,47 +189,32 @@ Registers an error quark for 
-
NMSettingSerial

-
typedef struct _NMSettingSerial NMSettingSerial;

-

-

-

-

-

-
NMSettingSerialClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingSerialClass;
+
NM_SETTING_SERIAL_SETTING_NAME

+
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

 

 

 

 

 

-
nm_setting_serial_get_type ()

-
GType               nm_setting_serial_get_type          (void);

+
NM_SETTING_SERIAL_STOPBITS

+
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
+

 

 

 

 

 

-
nm_setting_serial_new ()

-
NMSetting *         nm_setting_serial_new               (void);

+
nm_setting_serial_error_quark ()

+
GQuark              nm_setting_serial_error_quark       (void);

 

-Creates a new NMSettingSerial object with default values.
+Registers an error quark for NMSettingSerial if necessary.
 

 

-
+

 
 

 
Returns :
the new empty NMSettingSerial object. [transfer full]
-the error quark used for NMSettingSerial errors.
 

 

 

@@ -319,8 +277,8 @@ Creates a new 
-
nm_setting_serial_get_stopbits ()

-
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

+
nm_setting_serial_get_send_delay ()

+
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

 

@@ -331,15 +289,15 @@ Creates a new Returns :

-
+

 
 
the "stopbits" property of the settingthe "send-delay" property of the setting
 

 
 

 

 

 

-
nm_setting_serial_get_send_delay ()

-
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

+
nm_setting_serial_get_stopbits ()

+
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

 

@@ -350,11 +308,27 @@ Creates a new Returns :

-
+

 
 
the "send-delay" property of the settingthe "stopbits" property of the setting
 

 
 

 

+

+

+
nm_setting_serial_new ()

+
NMSetting *         nm_setting_serial_new               (void);

+

+Creates a new NMSettingSerial object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingSerial object. [transfer full]
+

+

 

 

 
Property Details

@@ -413,6 +387,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 1c6264d0..4f397cc3 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,57 +44,54 @@
 
 #include <nm-setting-vpn.h>
 
-#define             NM_SETTING_VPN_SETTING_NAME
-enum                NMSettingVpnError;
-#define             NM_TYPE_SETTING_VPN_ERROR
-#define             NM_SETTING_VPN_ERROR
-GQuark              nm_setting_vpn_error_quark          (void);
-#define             NM_SETTING_VPN_SERVICE_TYPE
-#define             NM_SETTING_VPN_USER_NAME
-#define             NM_SETTING_VPN_DATA
-#define             NM_SETTING_VPN_SECRETS
                     NMSettingVPN;
                     NMSettingVPNClass;
+enum                NMSettingVpnError;
 void                (*NMVPNIterFunc)                    (const char *key,
                                                          const char *value,
                                                          gpointer user_data);
-GType               nm_setting_vpn_get_type             (void);
-NMSetting *         nm_setting_vpn_new                  (void);
-const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
-const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
+#define             NM_SETTING_VPN_DATA
+#define             NM_SETTING_VPN_SECRETS
+#define             NM_SETTING_VPN_SERVICE_TYPE
+#define             NM_SETTING_VPN_SETTING_NAME
+#define             NM_SETTING_VPN_USER_NAME
 void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *item);
-const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
 void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *secret);
+GQuark              nm_setting_vpn_error_quark          (void);
+void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);
+void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);
+const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
+                                                         const char *key);
 const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);
+const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
+const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
+NMSetting *         nm_setting_vpn_new                  (void);
+void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+                                                         const char *key);
 void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);
-void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
 

 
 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingVpnError
-

 
   GObject
    +----NMSetting
          +----NMSettingVPN
 

+
+  GEnum
+   +----NMSettingVpnError
+

 

 

 
Properties

@@ -120,15 +117,30 @@ properties.
 

 
Details

 

-
NM_SETTING_VPN_SETTING_NAME

-
#define NM_SETTING_VPN_SETTING_NAME "vpn"
+
NMSettingVPN

+
typedef struct _NMSettingVPN NMSettingVPN;

+

+

+

+

+

+
NMSettingVPNClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingVPNClass;
 

 

 

 

 

 

-
enum NMSettingVpnError

+
enum NMSettingVpnError

 
typedef enum {
 	NM_SETTING_VPN_ERROR_UNKNOWN = 0,
 	NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
@@ -159,111 +171,97 @@ required
 

 

 

-
NM_TYPE_SETTING_VPN_ERROR

-
#define NM_TYPE_SETTING_VPN_ERROR (nm_setting_vpn_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_VPN_ERROR

-
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
-

-

-

-

-

-

-
nm_setting_vpn_error_quark ()

-
GQuark              nm_setting_vpn_error_quark          (void);

-

-Registers an error quark for NMSettingVPN if necessary.
-

+
NMVPNIterFunc ()

+
void                (*NMVPNIterFunc)                    (const char *key,
+                                                         const char *value,
+                                                         gpointer user_data);

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

 

Returns :
the error quark used for NMSettingVPN errors.
key :
the name of the data or secret item
value :
the value of the data or secret item
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
+nm_setting_vpn_foreach_secret()
+

 

 

 

 

-
NM_SETTING_VPN_SERVICE_TYPE

-
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
+
NM_SETTING_VPN_DATA

+
#define NM_SETTING_VPN_DATA         "data"
 

 

 

 

 

 

-
NM_SETTING_VPN_USER_NAME

-
#define NM_SETTING_VPN_USER_NAME    "user-name"
+
NM_SETTING_VPN_SECRETS

+
#define NM_SETTING_VPN_SECRETS      "secrets"
 

 

 

 

 

 

-
NM_SETTING_VPN_DATA

-
#define NM_SETTING_VPN_DATA         "data"
+
NM_SETTING_VPN_SERVICE_TYPE

+
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

 

 

 

 

 

-
NM_SETTING_VPN_SECRETS

-
#define NM_SETTING_VPN_SECRETS      "secrets"
+
NM_SETTING_VPN_SETTING_NAME

+
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

 

 

 

 

 

-
NMSettingVPN

-
typedef struct _NMSettingVPN NMSettingVPN;

+
NM_SETTING_VPN_USER_NAME

+
#define NM_SETTING_VPN_USER_NAME    "user-name"
+

 

 

 

 

 

-
NMSettingVPNClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVPNClass;
-

+
nm_setting_vpn_add_data_item ()

+
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *item);

 

+Establishes a relationship between key and item internally in the
+setting which may be retrieved later.  Should not be used to store passwords
+or other secrets, which is what nm_setting_vpn_add_secret() is for.
 

-

-

-

-
NMVPNIterFunc ()

-
void                (*NMVPNIterFunc)                    (const char *key,
-                                                         const char *value,
-                                                         gpointer user_data);

 

-
-
+
+
-
-
+
+
-
-
+
@@ -271,96 +269,109 @@ Registers an error quark for 
-
nm_setting_vpn_get_type ()

-
GType               nm_setting_vpn_get_type             (void);

+
nm_setting_vpn_add_secret ()

+
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *secret);

+Establishes a relationship between key and secret internally in the
+setting which may be retrieved later.
 

+

 
 
 
key :
the name of the data or secret item
setting :
the NMSettingVPN
+
 

 
value :
the value of the data or secret item
key :
a name that uniquely identifies the given value item
+
 

 
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
-nm_setting_vpn_foreach_secret()
+
item :
the value to be referenced by key
 
 

 
 

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


setting :
the NMSettingVPN
+
key :
a name that uniquely identifies the given secret secret
+
secret :
the secret to be referenced by key
+

 

 

 

-
nm_setting_vpn_new ()

-
NMSetting *         nm_setting_vpn_new                  (void);

+
nm_setting_vpn_error_quark ()

+
GQuark              nm_setting_vpn_error_quark          (void);

 

-Creates a new NMSettingVPN object with default values.
+Registers an error quark for NMSettingVPN if necessary.
 

 

-
+

 
 

 
Returns :
the new empty NMSettingVPN object. [transfer full]
-the error quark used for NMSettingVPN errors.
 

 

 

 

 

-
nm_setting_vpn_get_service_type ()

-
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

+
nm_setting_vpn_foreach_data_item ()

+
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Returns the service name of the VPN, which identifies the specific VPN
-plugin that should be used to connect to this VPN.
+Iterates all data items stored in this setting.  It is safe to add, remove,
+and modify data items inside func, though any additions or removals made
+during iteration will not be part of the iteration.
 

 

-
-
-
-
-
-

 
 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
Returns :
the VPN plugin's service name

-

-

-

-
nm_setting_vpn_get_user_name ()

-
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

-

--
-
-
-
+
-
-
+
+


setting :
the NMSettingVPN
+
func :
an user provided function. [scope call]
 
 

 
Returns :
the "user-name" property of the setting
user_data :
data to be passed to func
+
 

 
 

 

 

 

-
nm_setting_vpn_add_data_item ()

-
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *item);

+
nm_setting_vpn_foreach_secret ()

+
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Establishes a relationship between key and item internally in the
-setting which may be retrieved later.  Should not be used to store passwords
-or other secrets, which is what nm_setting_vpn_add_secret() is for.
+Iterates all secrets stored in this setting.  It is safe to add, remove,
+and modify secrets inside func, though any additions or removals made during
+iteration will not be part of the iteration.
 

 

-
-
-
+
-
-
+
@@ -396,12 +407,12 @@ by 
-
nm_setting_vpn_remove_data_item ()

-
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+
nm_setting_vpn_get_secret ()

+
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);

 

-Deletes a key/value relationship previously established by
-nm_setting_vpn_add_data_item().
+Retrieves the secret of a key/value relationship previously established
+by nm_setting_vpn_add_secret().
 

 

 
 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
key :
a name that uniquely identifies the given value item
+
func :
an user provided function. [scope call]
 
 

 
item :
the value to be referenced by key
+
user_data :
data to be passed to func
 
 

 
@@ -413,53 +424,42 @@ Deletes a key/value relationship previously established by
 
-
+
+
+
+
+

 

 

 
key :
the name of the data item to removethe name of the secret to retrieve
Returns :
the secret, if any
 

 
 

 

 

 

-
nm_setting_vpn_foreach_data_item ()

-
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_get_service_type ()

+
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

 

-Iterates all data items stored in this setting.  It is safe to add, remove,
-and modify data items inside func, though any additions or removals made
-during iteration will not be part of the iteration.
+Returns the service name of the VPN, which identifies the specific VPN
+plugin that should be used to connect to this VPN.
 

 

-
-
-
-
-
-
-
+
+

 
 
 

 
setting :
a NMSettingVPN
-
func :
an user provided function. [scope call]
+the NMSettingVPN
 
 

 
user_data :
data to be passed to func
-
Returns :
the VPN plugin's service name
 

 
 

 

 

 

-
nm_setting_vpn_add_secret ()

-
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);

-

-Establishes a relationship between key and secret internally in the
-setting which may be retrieved later.
-

+
nm_setting_vpn_get_user_name ()

+
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

 

@@ -469,54 +469,36 @@ setting which may be retrieved later.
 
-
-
-
-
-
-
+
+

 
 
 
 
key :
a name that uniquely identifies the given secret secret
-
secret :
the secret to be referenced by key
-
Returns :
the "user-name" property of the setting
 

 
 

 

 

 

-
nm_setting_vpn_get_secret ()

-
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
-                                                         const char *key);

+
nm_setting_vpn_new ()

+
NMSetting *         nm_setting_vpn_new                  (void);

 

-Retrieves the secret of a key/value relationship previously established
-by nm_setting_vpn_add_secret().
+Creates a new NMSettingVPN object with default values.
 

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

 

setting :
the NMSettingVPN
-
key :
the name of the secret to retrieve

 
Returns :
the secret, if any
the new empty NMSettingVPN object. [transfer full]
+

 

 

 

 

-
nm_setting_vpn_remove_secret ()

-
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
+
nm_setting_vpn_remove_data_item ()

+
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
                                                          const char *key);

 

 Deletes a key/value relationship previously established by
-nm_setting_vpn_add_secret().
+nm_setting_vpn_add_data_item().
 

 
@@ -528,39 +510,31 @@ Deletes a key/value relationship previously established by
 
-
+

 

 

 
key :
the name of the secret to removethe name of the data item to remove
 

 
 

 

 

 

-
nm_setting_vpn_foreach_secret ()

-
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_remove_secret ()

+
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
+                                                         const char *key);

 

-Iterates all secrets stored in this setting.  It is safe to add, remove,
-and modify secrets inside func, though any additions or removals made during
-iteration will not be part of the iteration.
+Deletes a key/value relationship previously established by
+nm_setting_vpn_add_secret().
 

 

-
-
-
-
-
-
-
+
+

 
 
 

 
setting :
a NMSettingVPN
-
func :
an user provided function. [scope call]
+the NMSettingVPN
 
 

 
user_data :
data to be passed to func
-
key :
the name of the secret to remove
 

 
 

@@ -607,6 +581,6 @@ plugin.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 919c9b0a..abaa48d8 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,32 +44,29 @@
 
 #include <nm-setting-wimax.h>
 
-#define             NM_SETTING_WIMAX_SETTING_NAME
-enum                NMSettingWimaxError;
-#define             NM_TYPE_SETTING_WIMAX_ERROR
-#define             NM_SETTING_WIMAX_ERROR
-GQuark              nm_setting_wimax_error_quark        (void);
-#define             NM_SETTING_WIMAX_NETWORK_NAME
-#define             NM_SETTING_WIMAX_MAC_ADDRESS
                     NMSettingWimax;
                     NMSettingWimaxClass;
-GType               nm_setting_wimax_get_type           (void);
-NMSetting *         nm_setting_wimax_new                (void);
-const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+enum                NMSettingWimaxError;
+#define             NM_SETTING_WIMAX_MAC_ADDRESS
+#define             NM_SETTING_WIMAX_NETWORK_NAME
+#define             NM_SETTING_WIMAX_SETTING_NAME
+GQuark              nm_setting_wimax_error_quark        (void);
 const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
+const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+NMSetting *         nm_setting_wimax_new                (void);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWimaxError
-

 
   GObject
    +----NMSetting
          +----NMSettingWimax
 

+
+  GEnum
+   +----NMSettingWimaxError
+

 

 

 
Properties

@@ -88,15 +85,24 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 

 
Details

 

-
NM_SETTING_WIMAX_SETTING_NAME

-
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
+
NMSettingWimax

+
typedef struct _NMSettingWimax NMSettingWimax;

+

+

+

+

+

+
NMSettingWimaxClass

+
typedef struct {
+	NMSettingClass parent;
+} NMSettingWimaxClass;
 

 

 

 

 

 

-
enum NMSettingWimaxError

+
enum NMSettingWimaxError

 
typedef enum {
 	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,
 	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
@@ -127,16 +133,24 @@ required
 

 

 

-
NM_TYPE_SETTING_WIMAX_ERROR

-
#define NM_TYPE_SETTING_WIMAX_ERROR (nm_setting_wimax_error_get_type ()) 
+
NM_SETTING_WIMAX_MAC_ADDRESS

+
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
+

+

+

+

+

+

+
NM_SETTING_WIMAX_NETWORK_NAME

+
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 

 

 

 

 

 

-
NM_SETTING_WIMAX_ERROR

-
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
+
NM_SETTING_WIMAX_SETTING_NAME

+
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 

 

 

@@ -158,57 +172,25 @@ Registers an error quark for 
-
NM_SETTING_WIMAX_NETWORK_NAME

-
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
-

-

-

-

-

-

-
NM_SETTING_WIMAX_MAC_ADDRESS

-
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
-

-

-

-

-

-

-
NMSettingWimax

-
typedef struct _NMSettingWimax NMSettingWimax;

-

-

-

-

-

-
NMSettingWimaxClass

-
typedef struct {
-	NMSettingClass parent;
-} NMSettingWimaxClass;
-

-

-

-

-

-

-
nm_setting_wimax_get_type ()

-
GType               nm_setting_wimax_get_type           (void);

-

-

-

-

-

-
nm_setting_wimax_new ()

-
NMSetting *         nm_setting_wimax_new                (void);

+
nm_setting_wimax_get_mac_address ()

+
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

 

-Creates a new NMSettingWimax object with default values.
+Returns the MAC address of a WiMAX device which this connection is locked
+to.
 

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

 

setting :
the NMSettingWimax
+

 
Returns :
the new empty NMSettingWimax object
the MAC address

 

 

 

@@ -236,25 +218,17 @@ specific WiMAX network this setting describes a connection to.
 

 

 

-
nm_setting_wimax_get_mac_address ()

-
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

+
nm_setting_wimax_new ()

+
NMSetting *         nm_setting_wimax_new                (void);

 

-Returns the MAC address of a WiMAX device which this connection is locked
-to.
+Creates a new NMSettingWimax object with default values.
 

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

 

setting :
the NMSettingWimax
-

 
Returns :
the MAC address
the new empty NMSettingWimax object

 

 

 

@@ -283,6 +257,6 @@ should use.
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index dc01f965..f2b70999 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,41 +44,37 @@
 
 #include <nm-setting-wired.h>
 
-#define             NM_SETTING_WIRED_SETTING_NAME
-enum                NMSettingWiredError;
-#define             NM_TYPE_SETTING_WIRED_ERROR
-#define             NM_SETTING_WIRED_ERROR
-GQuark              nm_setting_wired_error_quark        (void);
-#define             NM_SETTING_WIRED_PORT
-#define             NM_SETTING_WIRED_SPEED
-#define             NM_SETTING_WIRED_DUPLEX
+                    NMSettingWired;
+                    NMSettingWiredClass;
+enum                NMSettingWiredError;
 #define             NM_SETTING_WIRED_AUTO_NEGOTIATE
-#define             NM_SETTING_WIRED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
+#define             NM_SETTING_WIRED_DUPLEX
+#define             NM_SETTING_WIRED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRED_MTU
-#define             NM_SETTING_WIRED_S390_SUBCHANNELS
+#define             NM_SETTING_WIRED_PORT
 #define             NM_SETTING_WIRED_S390_NETTYPE
 #define             NM_SETTING_WIRED_S390_OPTIONS
-                    NMSettingWired;
-                    NMSettingWiredClass;
-GType               nm_setting_wired_get_type           (void);
-NMSetting *         nm_setting_wired_new                (void);
-const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
-guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
-const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
+#define             NM_SETTING_WIRED_S390_SUBCHANNELS
+#define             NM_SETTING_WIRED_SETTING_NAME
+#define             NM_SETTING_WIRED_SPEED
+gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);
+GQuark              nm_setting_wired_error_quark        (void);
 gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
-const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GByteArray *  nm_setting_wired_get_cloned_mac_address
                                                         (NMSettingWired *setting);
+const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
+const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);
 guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);
-const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);
-const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);
 guint32             nm_setting_wired_get_num_s390_options
                                                         (NMSettingWired *setting);
+const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
+const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);
 gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
                                                          guint32 idx,
                                                          const char **out_key,
@@ -86,24 +82,25 @@ const char *        char *        nm_setting_wired_get_s390_option_by_key
                                                         (NMSettingWired *setting,
                                                          const char *key);
-gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);
+const GPtrArray *   nm_setting_wired_get_s390_subchannels
+                                                        (NMSettingWired *setting);
+guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
+NMSetting *         nm_setting_wired_new                (void);
 gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                                          const char *key);
 

 
 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWiredError
-

 
   GObject
    +----NMSetting
          +----NMSettingWired
 

+
+  GEnum
+   +----NMSettingWiredError
+

 

 

 
Properties

@@ -131,15 +128,30 @@ necessary for connection to Ethernet networks.
 

 
Details

 

-
NM_SETTING_WIRED_SETTING_NAME

-
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
+
NMSettingWired

+
typedef struct _NMSettingWired NMSettingWired;

+

+

+

+

+

+
NMSettingWiredClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWiredClass;
 

 

 

 

 

 

-
enum NMSettingWiredError

+
enum NMSettingWiredError

 
typedef enum {
 	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,
 	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
@@ -170,47 +182,16 @@ required
 

 

 

-
NM_TYPE_SETTING_WIRED_ERROR

-
#define NM_TYPE_SETTING_WIRED_ERROR (nm_setting_wired_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_WIRED_ERROR

-
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
-

-

-

-

-

-

-
nm_setting_wired_error_quark ()

-
GQuark              nm_setting_wired_error_quark        (void);

-

-Registers an error quark for NMSettingWired if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingWired errors.

-

-

-

-
NM_SETTING_WIRED_PORT

-
#define NM_SETTING_WIRED_PORT "port"
+
NM_SETTING_WIRED_AUTO_NEGOTIATE

+
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

 

 

 

 

 

-
NM_SETTING_WIRED_SPEED

-
#define NM_SETTING_WIRED_SPEED "speed"
+
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

 

@@ -225,14 +206,6 @@ Registers an error quark for 
-
NM_SETTING_WIRED_AUTO_NEGOTIATE

-
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
-

-

-

-

-

-

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

@@ -241,14 +214,6 @@ Registers an error quark for 
-
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
-

-

-

-

-

-

 
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

 
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

@@ -265,8 +230,8 @@ Registers an error quark for 
-
NM_SETTING_WIRED_S390_SUBCHANNELS

-
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
+
NM_SETTING_WIRED_PORT

+
#define NM_SETTING_WIRED_PORT "port"
 

 

 

@@ -289,54 +254,56 @@ Registers an error quark for 
-
NMSettingWired

-
typedef struct _NMSettingWired NMSettingWired;

+
NM_SETTING_WIRED_S390_SUBCHANNELS

+
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
+

 

 

 

 

 

-
NMSettingWiredClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWiredClass;
+
NM_SETTING_WIRED_SETTING_NAME

+
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

 

 

 

 

 

-
nm_setting_wired_get_type ()

-
GType               nm_setting_wired_get_type           (void);

+
NM_SETTING_WIRED_SPEED

+
#define NM_SETTING_WIRED_SPEED "speed"
+

 

 

 

 

 

-
nm_setting_wired_new ()

-
NMSetting *         nm_setting_wired_new                (void);

+
nm_setting_wired_add_s390_option ()

+
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);

 

-Creates a new NMSettingWired object with default values.
+

+

+

+

+
nm_setting_wired_error_quark ()

+
GQuark              nm_setting_wired_error_quark        (void);

+

+Registers an error quark for NMSettingWired if necessary.
 

 

-
+

 
 

 
Returns :
the new empty NMSettingWired object. [transfer full]
-the error quark used for NMSettingWired errors.
 

 

 

 

 

-
nm_setting_wired_get_port ()

-
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

+
nm_setting_wired_get_auto_negotiate ()

+
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

 

@@ -347,15 +314,16 @@ Creates a new 
 
 
-
+

 
 

 
Returns :
the "port" property of the settingthe "auto-negotiate" property of the setting
 

 
 

 

 

 

-
nm_setting_wired_get_speed ()

-
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

+
nm_setting_wired_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wired_get_cloned_mac_address
+                                                        (NMSettingWired *setting);

 

@@ -366,7 +334,7 @@ Creates a new 
 
 
-
+

 
 

 
Returns :
the "speed" property of the settingthe "cloned-mac-address" property of the setting
 

 
 

@@ -392,25 +360,6 @@ Creates a new 
 

 

 

-
nm_setting_wired_get_auto_negotiate ()

-
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

-

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


setting :
the NMSettingWired
-
Returns :
the "auto-negotiate" property of the setting

-

-

-

 
nm_setting_wired_get_mac_address ()

 
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

 

@@ -430,26 +379,6 @@ Creates a new 
 
 

 

-
nm_setting_wired_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wired_get_cloned_mac_address
-                                                        (NMSettingWired *setting);

-

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


setting :
the NMSettingWired
-
Returns :
the "cloned-mac-address" property of the setting

-

-

-

 
nm_setting_wired_get_mac_address_blacklist ()

 
const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);

@@ -491,13 +420,13 @@ property of the setting. [
-
nm_setting_wired_get_s390_subchannels ()

-
const GPtrArray *   nm_setting_wired_get_s390_subchannels
+
nm_setting_wired_get_num_s390_options ()

+
guint32             nm_setting_wired_get_num_s390_options
                                                         (NMSettingWired *setting);

 

-Return the list of s390 subchannels that identify the device that this
-connection is applicable to.  The connection should only be used in
-conjunction with that device.
+Returns the number of s390-specific options that should be set for this
+device when it is activated.  This can be used to retrieve each s390
+option individually using nm_setting_wired_get_s390_option().
 

 
@@ -509,22 +438,15 @@ conjunction with that device.
 
-
+

 

 

 
Returns :

-GPtrArray of strings, each specifying one
-subchannel the s390 device uses to communicate to the host. [element-type utf8]
-the number of s390-specific device options
 

 
 

 

 

 

-
nm_setting_wired_get_s390_nettype ()

-
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

-

-Returns the s390 device type this connection should apply to.  Will be one
-of 'qeth', 'lcs', or 'ctc'.
-

+
nm_setting_wired_get_port ()

+
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

 

@@ -535,20 +457,18 @@ of 'qeth', 'lcs', or 'ctc'.
 
-
+

 
 
 

 
Returns :
the s390 device typethe "port" property of the setting
 

 
 

 

 

 

-
nm_setting_wired_get_num_s390_options ()

-
guint32             nm_setting_wired_get_num_s390_options
-                                                        (NMSettingWired *setting);

+
nm_setting_wired_get_s390_nettype ()

+
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

 

-Returns the number of s390-specific options that should be set for this
-device when it is activated.  This can be used to retrieve each s390
-option individually using nm_setting_wired_get_s390_option().
+Returns the s390 device type this connection should apply to.  Will be one
+of 'qeth', 'lcs', or 'ctc'.
 

 
@@ -560,7 +480,7 @@ option individually using Returns :

-
+

 

the number of s390-specific device optionsthe s390 device type
 

 
 

@@ -646,12 +566,66 @@ setting; the value is owned by the setting and must not be modified
 

 

 

-
nm_setting_wired_add_s390_option ()

-
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);

+
nm_setting_wired_get_s390_subchannels ()

+
const GPtrArray *   nm_setting_wired_get_s390_subchannels
+                                                        (NMSettingWired *setting);

 

+Return the list of s390 subchannels that identify the device that this
+connection is applicable to.  The connection should only be used in
+conjunction with that device.
 

+

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


setting :
the NMSettingWired
+
Returns :

+GPtrArray of strings, each specifying one
+subchannel the s390 device uses to communicate to the host. [element-type utf8]
+

+

+

+

+
nm_setting_wired_get_speed ()

+
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

+

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


setting :
the NMSettingWired
+
Returns :
the "speed" property of the setting

+

+

+

+
nm_setting_wired_new ()

+
NMSetting *         nm_setting_wired_new                (void);

+

+Creates a new NMSettingWired object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingWired object. [transfer full]
+

 

 

 

@@ -780,6 +754,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index c719a248..a860f226 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,70 +44,67 @@
 
 #include <nm-setting-wireless.h>
 
-#define             NM_SETTING_WIRELESS_SETTING_NAME
-enum                NMSettingWirelessError;
-#define             NM_TYPE_SETTING_WIRELESS_ERROR
-#define             NM_SETTING_WIRELESS_ERROR
-GQuark              nm_setting_wireless_error_quark     (void);
-#define             NM_SETTING_WIRELESS_SSID
-#define             NM_SETTING_WIRELESS_MODE
+                    NMSettingWireless;
+                    NMSettingWirelessClass;
+enum                NMSettingWirelessError;
 #define             NM_SETTING_WIRELESS_BAND
-#define             NM_SETTING_WIRELESS_CHANNEL
 #define             NM_SETTING_WIRELESS_BSSID
-#define             NM_SETTING_WIRELESS_RATE
-#define             NM_SETTING_WIRELESS_TX_POWER
-#define             NM_SETTING_WIRELESS_MAC_ADDRESS
+#define             NM_SETTING_WIRELESS_CHANNEL
 #define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+#define             NM_SETTING_WIRELESS_MAC_ADDRESS
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-#define             NM_SETTING_WIRELESS_MTU
-#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
-#define             NM_SETTING_WIRELESS_SEC
+#define             NM_SETTING_WIRELESS_MODE
 #define             NM_SETTING_WIRELESS_MODE_ADHOC
 #define             NM_SETTING_WIRELESS_MODE_INFRA
-                    NMSettingWireless;
-                    NMSettingWirelessClass;
-GType               nm_setting_wireless_get_type        (void);
-NMSetting *         nm_setting_wireless_new             (void);
-const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
+#define             NM_SETTING_WIRELESS_MTU
+#define             NM_SETTING_WIRELESS_RATE
+#define             NM_SETTING_WIRELESS_SEC
+#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
+#define             NM_SETTING_WIRELESS_SETTING_NAME
+#define             NM_SETTING_WIRELESS_SSID
+#define             NM_SETTING_WIRELESS_TX_POWER
+gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);
+gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);
+GQuark              nm_setting_wireless_error_quark     (void);
 const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);
 const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);
 const GByteArray *  nm_setting_wireless_get_cloned_mac_address
                                                         (NMSettingWireless *setting);
+const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
 guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
-gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);
 guint32             nm_setting_wireless_get_num_seen_bssids
                                                         (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
 const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);
-gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
+const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
+NMSetting *         nm_setting_wireless_new             (void);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessError
-

 
   GObject
    +----NMSetting
          +----NMSettingWireless
 

+
+  GEnum
+   +----NMSettingWirelessError
+

 

 

 
Properties

@@ -137,15 +134,30 @@ necessary for connection to 802.11 WiFi networks.
 

 
Details

 

-
NM_SETTING_WIRELESS_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
+
NMSettingWireless

+
typedef struct _NMSettingWireless NMSettingWireless;

+

+

+

+

+

+
NMSettingWirelessClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessClass;
 

 

 

 

 

 

-
enum NMSettingWirelessError

+
enum NMSettingWirelessError

 
typedef enum {
 	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,
 	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
@@ -190,55 +202,16 @@ set to a value that requires the 
-
NM_TYPE_SETTING_WIRELESS_ERROR

-
#define NM_TYPE_SETTING_WIRELESS_ERROR (nm_setting_wireless_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_ERROR

-
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
-

-

-

-

-

-

-
nm_setting_wireless_error_quark ()

-
GQuark              nm_setting_wireless_error_quark     (void);

-

-Registers an error quark for NMSettingWireless if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingWireless errors.

-

-

-

-
NM_SETTING_WIRELESS_SSID

-
#define NM_SETTING_WIRELESS_SSID        "ssid"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_MODE

-
#define NM_SETTING_WIRELESS_MODE        "mode"
+
NM_SETTING_WIRELESS_BAND

+
#define NM_SETTING_WIRELESS_BAND        "band"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_BAND

-
#define NM_SETTING_WIRELESS_BAND        "band"
+
NM_SETTING_WIRELESS_BSSID

+
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

 

 

@@ -253,50 +226,53 @@ Registers an error quark for 
 

 

-
NM_SETTING_WIRELESS_BSSID

-
#define NM_SETTING_WIRELESS_BSSID       "bssid"
+
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_RATE

-
#define NM_SETTING_WIRELESS_RATE        "rate"
+
NM_SETTING_WIRELESS_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_TX_POWER

-
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
+
NM_SETTING_WIRELESS_MODE

+
#define NM_SETTING_WIRELESS_MODE        "mode"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
+
NM_SETTING_WIRELESS_MODE_ADHOC

+
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
 

 

+Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+
NM_SETTING_WIRELESS_MODE_INFRA

+
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
 

 

+Indicates infrastructure mode where an access point is expected to be present
+for this connection.
 

 

 

@@ -309,8 +285,8 @@ Registers an error quark for 
 

 

-
NM_SETTING_WIRELESS_SEEN_BSSIDS

-
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
+
NM_SETTING_WIRELESS_RATE

+
#define NM_SETTING_WIRELESS_RATE        "rate"
 

 

 

@@ -325,75 +301,48 @@ Registers an error quark for 
 

 

-
NM_SETTING_WIRELESS_MODE_ADHOC

-
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+
NM_SETTING_WIRELESS_SEEN_BSSIDS

+
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

 

-Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_MODE_INFRA

-
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+
NM_SETTING_WIRELESS_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

 

-Indicates infrastructure mode where an access point is expected to be present
-for this connection.
 

 

 

 

-
NMSettingWireless

-
typedef struct _NMSettingWireless NMSettingWireless;

-

-

-

-

-

-
NMSettingWirelessClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessClass;
+
NM_SETTING_WIRELESS_SSID

+
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

 

 

 

 

 

-
nm_setting_wireless_get_type ()

-
GType               nm_setting_wireless_get_type        (void);

+
NM_SETTING_WIRELESS_TX_POWER

+
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+

 

 

 

 

 

-
nm_setting_wireless_new ()

-
NMSetting *         nm_setting_wireless_new             (void);

+
nm_setting_wireless_add_seen_bssid ()

+
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);

 

-Creates a new NMSettingWireless object with default values.
+Adds a new WiFi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager tracks previously seen BSSIDs internally so this function
+no longer has much use.
 

 
-
-
-
-
-

 

Returns :
the new empty NMSettingWireless object. [transfer full]
-

-

-

-

-
nm_setting_wireless_get_ssid ()

-
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

-

-
@@ -401,54 +350,94 @@ Creates a new bssid :

+
+
+
-
+

 
 

 
setting :
the new BSSID to add to the list

 
Returns :
the "ssid" property of the setting
+TRUE if bssid was already known, FALSE if not
 

 
 

 

 

 

-
nm_setting_wireless_get_mode ()

-
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

+
nm_setting_wireless_ap_security_compatible ()

+
gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);

+

+Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
+determine if the configuration given by the settings is compatible with
+the security of an access point using that access point's capability flags
+and mode.  Useful for clients that wish to filter a set of connections
+against a set of access points and determine which connections are
+compatible with which access points.
+

 

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

 
 
 
setting :
the NMSettingWireless
+
s_wireless :
a NMSettingWireless
 
 

 
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
+capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
+capabilities
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure

 
Returns :
the "mode" property of the setting
+TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.
 

 
 

 

 

 

-
nm_setting_wireless_get_band ()

-
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

+
nm_setting_wireless_error_quark ()

+
GQuark              nm_setting_wireless_error_quark     (void);

+

+Registers an error quark for NMSettingWireless if necessary.
+

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

 

setting :
the NMSettingWireless
-

 
Returns :
the "band" property of the setting
the error quark used for NMSettingWireless errors.

 

 

 

 

-
nm_setting_wireless_get_channel ()

-
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

+
nm_setting_wireless_get_band ()

+
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

 

@@ -459,7 +448,7 @@ Creates a new Returns :

-
+

 
 
the "channel" property of the settingthe "band" property of the setting
 

 
 

@@ -485,8 +474,8 @@ Creates a new 
-
nm_setting_wireless_get_rate ()

-
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

+
nm_setting_wireless_get_channel ()

+
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

 

@@ -497,15 +486,16 @@ Creates a new Returns :

-
+

 
 
the "rate" property of the settingthe "channel" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_tx_power ()

-
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

+
nm_setting_wireless_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
+                                                        (NMSettingWireless *setting);

 

@@ -516,7 +506,7 @@ Creates a new Returns :

-
+

 
 
the "tx-power" property of the settingthe "cloned-mac-address" property of the setting
 

 
 

@@ -542,8 +532,8 @@ Creates a new 
-
nm_setting_wireless_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
+
nm_setting_wireless_get_mac_address_blacklist ()

+
const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);

 
@@ -555,16 +545,17 @@ Creates a new Returns :

-
+

 

the "cloned-mac-address" property of the settingthe
+"mac-address-blacklist" property of the setting. [element-type GLib.ByteArray]
+
 

 
 

 

 

 

-
nm_setting_wireless_get_mac_address_blacklist ()

-
const GSList *      nm_setting_wireless_get_mac_address_blacklist
-                                                        (NMSettingWireless *setting);

+
nm_setting_wireless_get_mode ()

+
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

 

@@ -575,9 +566,7 @@ Creates a new Returns :

-
+

 
 
the
-"mac-address-blacklist" property of the setting. [element-type GLib.ByteArray]
-the "mode" property of the setting
 

 
 

@@ -603,8 +592,9 @@ Creates a new 
-
nm_setting_wireless_get_security ()

-
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

+
nm_setting_wireless_get_num_seen_bssids ()

+
guint32             nm_setting_wireless_get_num_seen_bssids
+                                                        (NMSettingWireless *setting);

 

@@ -615,21 +605,15 @@ Creates a new Returns :

-
+

 
 
the "security" property of the settingthe number of BSSIDs in the previously seen BSSID list
 

 
 

 

 

 

-
nm_setting_wireless_add_seen_bssid ()

-
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);

-

-Adds a new WiFi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager tracks previously seen BSSIDs internally so this function
-no longer has much use.
-

+
nm_setting_wireless_get_rate ()

+
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

 

@@ -639,22 +623,16 @@ no longer has much use.
 
-
-
-
-
-
+

 
 
 
 
bssid :
the new BSSID to add to the list

 
Returns :

-TRUE if bssid was already known, FALSE if notthe "rate" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_num_seen_bssids ()

-
guint32             nm_setting_wireless_get_num_seen_bssids
-                                                        (NMSettingWireless *setting);

+
nm_setting_wireless_get_security ()

+
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

 

@@ -665,7 +643,7 @@ no longer has much use.
 
-
+

 
 
 

 
Returns :
the number of BSSIDs in the previously seen BSSID listthe "security" property of the setting
 

 
 

@@ -697,62 +675,58 @@ no longer has much use.
 

 

 

-
nm_setting_wireless_ap_security_compatible ()

-
gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);

-

-Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
-determine if the configuration given by the settings is compatible with
-the security of an access point using that access point's capability flags
-and mode.  Useful for clients that wish to filter a set of connections
-against a set of access points and determine which connections are
-compatible with which access points.
-

+
nm_setting_wireless_get_ssid ()

+
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

 

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

 
 
 
s_wireless :
a NMSettingWireless
-
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
setting :
the NMSettingWireless
 
 

 
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
-capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
-capabilities
Returns :
the "ssid" property of the setting
 

+

+

+

+
nm_setting_wireless_get_tx_power ()

+
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

+

++
-
-
+
+
-
+


 
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure
setting :
the NMSettingWireless
+
 

 

 
Returns :

-TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.the "tx-power" property of the setting
 

 
 

 

+

+

+
nm_setting_wireless_new ()

+
NMSetting *         nm_setting_wireless_new             (void);

+

+Creates a new NMSettingWireless object with default values.
+

+

++
+
+
+
+


Returns :
the new empty NMSettingWireless object. [transfer full]
+

+

 

 

 
Property Details

@@ -899,6 +873,6 @@ devices support setting a static transmit power.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 0d13105c..c9b8d399 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -45,114 +45,110 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 #include <nm-setting-wireless-security.h>
 
-#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
-enum                NMSettingWirelessSecurityError;
-#define             NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
-#define             NM_SETTING_WIRELESS_SECURITY_ERROR
-GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);
+                    NMSettingWirelessSecurity;
+                    NMSettingWirelessSecurityClass;
+enum                NMSettingWirelessSecurityError;
 enum                NMWepKeyType;
-#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 #define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-#define             NM_SETTING_WIRELESS_SECURITY_PROTO
-#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
 #define             NM_SETTING_WIRELESS_SECURITY_GROUP
+#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
+#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
+#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
+#define             NM_SETTING_WIRELESS_SECURITY_PROTO
+#define             NM_SETTING_WIRELESS_SECURITY_PSK
+#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
+#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
-#define             NM_SETTING_WIRELESS_SECURITY_PSK
-#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
-                    NMSettingWirelessSecurity;
-                    NMSettingWirelessSecurityClass;
-GType               nm_setting_wireless_security_get_type
-                                                        (void);
-NMSetting *         nm_setting_wireless_security_new    (void);
-const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_proto
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
+gboolean            nm_setting_wireless_security_add_group
                                                         (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
+                                                         const char *group);
+gboolean            nm_setting_wireless_security_add_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *pairwise);
 gboolean            nm_setting_wireless_security_add_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *proto);
-void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
+void                nm_setting_wireless_security_clear_groups
+                                                        (NMSettingWirelessSecurity *setting);
+void                nm_setting_wireless_security_clear_pairwise
+                                                        (NMSettingWirelessSecurity *setting);
 void                nm_setting_wireless_security_clear_protos
                                                         (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_pairwise
+GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);
+const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-gboolean            nm_setting_wireless_security_add_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);
-void                nm_setting_wireless_security_remove_pairwise
+const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-void                nm_setting_wireless_security_clear_pairwise
+const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_leap_password
+                                                        (NMSettingWirelessSecurity *setting);
+NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
 guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_group
+guint32             nm_setting_wireless_security_get_num_pairwise
+                                                        (NMSettingWirelessSecurity *setting);
+guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);
-void                nm_setting_wireless_security_remove_group
+const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
+NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_username
+const char *        nm_setting_wireless_security_get_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx);
+NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_password
+NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
+guint32             nm_setting_wireless_security_get_wep_tx_keyidx
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_wep_key
+NMSetting *         nm_setting_wireless_security_new    (void);
+void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);
+                                                         guint32 i);
+void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
+void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
 void                nm_setting_wireless_security_set_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx,
                                                          const char *key);
-guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_auth_alg
-                                                        (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
-                                                        (NMSettingWirelessSecurity *setting);
 

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessSecurityError
-

 
   GObject
    +----NMSetting
          +----NMSettingWirelessSecurity
 

+
+  GEnum
+   +----NMSettingWirelessSecurityError
+

 

 

 
Properties

@@ -202,15 +198,30 @@ of how WiFi security works, you may want to get copies of the following books.
 

 
Details

 

-
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
+
NMSettingWirelessSecurity

+
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

+

+

+

+

+

+
NMSettingWirelessSecurityClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessSecurityClass;
 

 

 

 

 

 

-
enum NMSettingWirelessSecurityError

+
enum NMSettingWirelessSecurityError

 
typedef enum {
 	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,
 	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
@@ -270,30 +281,6 @@ encryption protocol
 

 

 

-
NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR

-
#define NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR (nm_setting_wireless_security_error_get_type ()) 
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_ERROR

-
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
-

-

-

-

-

-

-
nm_setting_wireless_security_error_quark ()

-
GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);

-

-

-

-

-

 
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -348,48 +335,40 @@ the actual WEP key using the MD5 hash algorithm.
 

 

 

-
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

-
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
+
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

+
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

-
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
+
NM_SETTING_WIRELESS_SECURITY_GROUP

+
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PROTO

-
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
+
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

+
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

-
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_GROUP

-
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

 

 

@@ -404,138 +383,114 @@ the actual WEP key using the MD5 hash algorithm.
 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
+
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

+
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
+
NM_SETTING_WIRELESS_SECURITY_PROTO

+
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
+
NM_SETTING_WIRELESS_SECURITY_PSK

+
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
+
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK

-
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 

 

 

 

 

 

-
NMSettingWirelessSecurity

-
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

-

-

-

-

-

-
NMSettingWirelessSecurityClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessSecurityClass;
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

 

 

 

 

 

-
nm_setting_wireless_security_get_type ()

-
GType               nm_setting_wireless_security_get_type
-                                                        (void);

+
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
+

 

 

 

 

 

-
nm_setting_wireless_security_new ()

-
NMSetting *         nm_setting_wireless_security_new    (void);

+
nm_setting_wireless_security_add_group ()

+
gboolean            nm_setting_wireless_security_add_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *group);

 

-Creates a new NMSettingWirelessSecurity object with default values.
+Adds an encryption algorithm to the list of allowed groupwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
 

 
-
-
-
-
-

 

Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
-

-

-

-

-
nm_setting_wireless_security_get_key_mgmt ()

-
const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);

-

-
@@ -543,39 +498,31 @@ Creates a new Returns :

-
-
-
-

 
 

 
setting :
the "key-mgmt" property of the setting

-

-

-

-
nm_setting_wireless_security_get_num_protos ()

-
guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);

-

--
-
-
-
+
+
-
+


setting :
the NMSettingWirelessSecurity
-
group :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 

 

 
Returns :
the number of security protocols this connection allows when
-connecting to secure WiFi networks
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_proto ()

-
const char *        nm_setting_wireless_security_get_proto
+
nm_setting_wireless_security_add_pairwise ()

+
gboolean            nm_setting_wireless_security_add_pairwise
                                                         (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

+                                                         const char *pairwise);

+

+Adds an encryption algorithm to the list of allowed pairwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
+

 

@@ -585,13 +532,15 @@ connecting to secure WiFi networks
-
-
+
+
-
+

 
 
 
 
 
i :
an index into the protocol list
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 

 

 
Returns :
the protocol at index i
-
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

@@ -633,26 +582,38 @@ protocol list, or 
-
nm_setting_wireless_security_remove_proto ()

-
void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

+
nm_setting_wireless_security_clear_groups ()

+
void                nm_setting_wireless_security_clear_groups
+                                                        (NMSettingWirelessSecurity *setting);

 

-Removes a protocol from the allowed protocol list.
+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all groupwise encryption algorithms are allowed.
 

 
-
-
+
-
-
-
-
-
-
+
+

 


 
setting :

 the NMSettingWirelessSecurity
 
i :
index of the protocol to remove

+

+

+

+
nm_setting_wireless_security_clear_pairwise ()

+
void                nm_setting_wireless_security_clear_pairwise
+                                                        (NMSettingWirelessSecurity *setting);

+

+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all pairwise encryption algorithms are allowed.
+

+

++
+
+
+


setting :
the NMSettingWirelessSecurity
+

 

 

 

@@ -675,8 +636,16 @@ specified then all protocols are allowed.
 

 

 

-
nm_setting_wireless_security_get_num_pairwise ()

-
guint32             nm_setting_wireless_security_get_num_pairwise
+
nm_setting_wireless_security_error_quark ()

+
GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);

+

+

+

+

+

+
nm_setting_wireless_security_get_auth_alg ()

+
const char *        nm_setting_wireless_security_get_auth_alg
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -688,19 +657,19 @@ specified then all protocols are allowed.
 
-
+

 

 

 
Returns :
the number of pairwise encryption algorithms in the allowed listthe "auth-alg" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_get_pairwise ()

-
const char *        nm_setting_wireless_security_get_pairwise
+
nm_setting_wireless_security_get_group ()

+
const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Returns the allowed pairwise encryption algorithm from allowed algorithm
+Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.
 

 

@@ -713,11 +682,11 @@ list.
 
-
+
-
@@ -725,16 +694,9 @@ list.
 

-
nm_setting_wireless_security_add_pairwise ()

-
gboolean            nm_setting_wireless_security_add_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);

-

-Adds an encryption algorithm to the list of allowed pairwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

+
nm_setting_wireless_security_get_key_mgmt ()

+
const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);

 

 

 
i :
index of an item in the allowed pairwise encryption algorithm listindex of an item in the allowed groupwise encryption algorithm list
 

 

 
Returns :
the pairwise encryption algorithm at index i
+the groupwise encryption algorithm at index i
 
 

 
 
 

@@ -744,29 +706,37 @@ compatible with this connection.
 
-
-
+
+
+
+
+

 
 
 
 
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
Returns :
the "key-mgmt" property of the setting

+

+

+

+
nm_setting_wireless_security_get_leap_password ()

+
const char *        nm_setting_wireless_security_get_leap_password
+                                                        (NMSettingWirelessSecurity *setting);

+

++
+
+
+
-
+


setting :
the NMSettingWirelessSecurity
+
 

 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe "leap-password" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_pairwise ()

-
void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed pairwise encryption
-algorithm list.
-

+
nm_setting_wireless_security_get_leap_password_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
+                                                        (NMSettingWirelessSecurity *setting);

 

@@ -776,28 +746,32 @@ algorithm list.
 
-
-
+
+

 
 
 
 
i :
the index of an item in the allowed pairwise encryption algorithm list
Returns :
the NMSettingSecretFlags pertaining to the
+"leap-password"
+
 

 
 

 

 

 

-
nm_setting_wireless_security_clear_pairwise ()

-
void                nm_setting_wireless_security_clear_pairwise
+
nm_setting_wireless_security_get_leap_username ()

+
const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all pairwise encryption algorithms are allowed.
-

 
-
+
+
-
+
+
+
+
+
+

 


 
setting :

 the NMSettingWirelessSecurity
 
Returns :
the "leap-username" property of the setting

 

 

 

@@ -822,14 +796,9 @@ specified then all pairwise encryption algorithms are allowed.
 

 

 

-
nm_setting_wireless_security_get_group ()

-
const char *        nm_setting_wireless_security_get_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Returns the allowed groupwise encryption algorithm from allowed algorithm
-list.
-

+
nm_setting_wireless_security_get_num_pairwise ()

+
guint32             nm_setting_wireless_security_get_num_pairwise
+                                                        (NMSettingWirelessSecurity *setting);

 

@@ -839,29 +808,17 @@ list.
 
-
-
-
-
-
+

 
 
 
 
i :
index of an item in the allowed groupwise encryption algorithm list

 
Returns :
the groupwise encryption algorithm at index i
-the number of pairwise encryption algorithms in the allowed list
 

 
 

 

 

 

-
nm_setting_wireless_security_add_group ()

-
gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);

-

-Adds an encryption algorithm to the list of allowed groupwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

+
nm_setting_wireless_security_get_num_protos ()

+
guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);

 

@@ -871,28 +828,22 @@ compatible with this connection.
 
-
-
-
-
-
+

 
 
 
 
group :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe number of security protocols this connection allows when
+connecting to secure WiFi networks
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_group ()

-
void                nm_setting_wireless_security_remove_group
+
nm_setting_wireless_security_get_pairwise ()

+
const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Removes an encryption algorithm from the allowed groupwise encryption
-algorithm list.
+Returns the allowed pairwise encryption algorithm from allowed algorithm
+list.
 

 
@@ -904,27 +855,40 @@ algorithm list.
 
-
+
+
+
+
+

 

 

 
i :
the index of an item in the allowed groupwise encryption algorithm listindex of an item in the allowed pairwise encryption algorithm list
Returns :
the pairwise encryption algorithm at index i
+
 

 
 

 

 

 

-
nm_setting_wireless_security_clear_groups ()

-
void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all groupwise encryption algorithms are allowed.
-

+
nm_setting_wireless_security_get_proto ()

+
const char *        nm_setting_wireless_security_get_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

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

 


 
setting :

 the NMSettingWirelessSecurity
 
i :
an index into the protocol list
Returns :
the protocol at index i
+

 

 

 

@@ -950,7 +914,7 @@ specified then all groupwise encryption algorithms are allowed.
 

 

 
nm_setting_wireless_security_get_psk_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_psk_flags
+
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -971,9 +935,10 @@ specified then all groupwise encryption algorithms are allowed.
 

-
nm_setting_wireless_security_get_leap_username ()

-
const char *        nm_setting_wireless_security_get_leap_username
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_get_wep_key ()

+
const char *        nm_setting_wireless_security_get_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx);

 

 

 
 

@@ -983,16 +948,20 @@ specified then all groupwise encryption algorithms are allowed.
 
+
+
+
+
-
+

 
 
 
 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the "leap-username" property of the settingthe WEP key at the given index
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_password ()

-
const char *        nm_setting_wireless_security_get_leap_password
+
nm_setting_wireless_security_get_wep_key_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -1004,15 +973,15 @@ specified then all groupwise encryption algorithms are allowed.
 
-
+

 

 

 
Returns :
the "leap-password" property of the settingthe NMSettingSecretFlags pertaining to the all WEP keys
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_leap_password_flags
+
nm_setting_wireless_security_get_wep_key_type ()

+
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
                                                         (NMSettingWirelessSecurity *setting);

 
@@ -1024,19 +993,16 @@ specified then all groupwise encryption algorithms are allowed.
 
-
+

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"leap-password"
-the "wep-key-type" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_key ()

-
const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);

+
nm_setting_wireless_security_get_wep_tx_keyidx ()

+
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+                                                        (NMSettingWirelessSecurity *setting);

 

@@ -1046,52 +1012,38 @@ specified then all groupwise encryption algorithms are allowed.
 
-
-
-
-
-
+

 
 
 
 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the WEP key at the given indexthe "wep-tx-keyidx" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_set_wep_key ()

-
void                nm_setting_wireless_security_set_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx,
-                                                         const char *key);

+
nm_setting_wireless_security_new ()

+
NMSetting *         nm_setting_wireless_security_new    (void);

 

-Sets a WEP key in the given index.
+Creates a new NMSettingWirelessSecurity object with default values.
 

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

 

setting :
the NMSettingWirelessSecurity
+
Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
 
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
-form as determiend by the value of the "wep-key-type"
-property.

 

 

 

 

-
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_remove_group ()

+
void                nm_setting_wireless_security_remove_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Removes an encryption algorithm from the allowed groupwise encryption
+algorithm list.
+

 

@@ -1101,17 +1053,22 @@ property.
-
-
+
+

 
 
 
 
 
Returns :
the "wep-tx-keyidx" property of the setting
i :
the index of an item in the allowed groupwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_auth_alg ()

-
const char *        nm_setting_wireless_security_get_auth_alg
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_remove_pairwise ()

+
void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Removes an encryption algorithm from the allowed pairwise encryption
+algorithm list.
+

 

@@ -1121,17 +1078,21 @@ property.
-
-
+
+

 
 
 
 
 
Returns :
the "auth-alg" property of the setting
i :
the index of an item in the allowed pairwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags  nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_remove_proto ()

+
void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Removes a protocol from the allowed protocol list.
+

 

@@ -1141,17 +1102,22 @@ property.
-
-
+
+

 
 
 
 
 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keys
i :
index of the protocol to remove
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_set_wep_key ()

+
void                nm_setting_wireless_security_set_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx,
+                                                         const char *key);

+

+Sets a WEP key in the given index.
+

 

@@ -1161,8 +1127,14 @@ property.
-
-
+
+
+
+
+
+

 
 
 
 
 
Returns :
the "wep-key-type" property of the setting
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
+form as determiend by the value of the "wep-key-type"
+property.
 

 
 

@@ -1360,6 +1332,6 @@ Linksys WRT54G) number the keys 1 - 4.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 5c359816..b9117001 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -72,6 +72,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index d2b7bdbe..728129f1 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -27,8 +27,6 @@
                       | 
                    S
                       | 
-                   T
-                      | 
                    U
                       | 
                    V
@@ -61,7 +59,7 @@
 
 

 

-NMConnectionError, enum in NMConnection
+NMConnectionError, enum in NMConnection
 

 

 

@@ -97,10 +95,6 @@
 

 

 

-NM_CONNECTION_ERROR, macro in NMConnection
-

-

-

 nm_connection_error_quark, function in NMConnection
 

 

@@ -185,10 +179,6 @@
 
 

 

-nm_connection_get_type, function in NMConnection
-

-

-

 nm_connection_get_uuid, function in NMConnection
 

 

@@ -274,10 +264,6 @@
 
 

 

-nm_ip4_address_get_type, function in NMSettingIP4Config
-

-

-

 nm_ip4_address_new, function in NMSettingIP4Config
 

 

@@ -326,10 +312,6 @@
 
 

 

-nm_ip4_route_get_type, function in NMSettingIP4Config
-

-

-

 nm_ip4_route_new, function in NMSettingIP4Config
 

 

@@ -386,10 +368,6 @@
 
 

 

-nm_ip6_address_get_type, function in NMSettingIP6Config
-

-

-

 nm_ip6_address_new, function in NMSettingIP6Config
 

 

@@ -438,10 +416,6 @@
 
 

 

-nm_ip6_route_get_type, function in NMSettingIP6Config
-

-

-

 nm_ip6_route_new, function in NMSettingIP6Config
 

 

@@ -599,7 +573,7 @@
 
 

 

-NMSetting8021xError, enum in NMSetting8021x
+NMSetting8021xError, enum in NMSetting8021x
 

 

 

@@ -623,7 +597,7 @@
 

 

 

-NMSettingBluetoothError, enum in NMSettingBluetooth
+NMSettingBluetoothError, enum in NMSettingBluetooth
 

 

 

@@ -651,7 +625,7 @@
 

 

 

-NMSettingCdmaError, enum in NMSettingCdma
+NMSettingCdmaError, enum in NMSettingCdma
 

 

 

@@ -703,7 +677,7 @@
 

 

 

-NMSettingConnectionError, enum in NMSettingConnection
+NMSettingConnectionError, enum in NMSettingConnection
 

 

 

@@ -711,7 +685,7 @@
 

 

 

-NMSettingError, enum in NMSetting
+NMSettingError, enum in NMSetting
 

 

 

@@ -767,7 +741,7 @@
 

 

 

-NMSettingGsmError, enum in NMSettingGsm
+NMSettingGsmError, enum in NMSettingGsm
 

 

 

@@ -839,7 +813,7 @@
 

 

 

-NMSettingIP4ConfigError, enum in NMSettingIP4Config
+NMSettingIP4ConfigError, enum in NMSettingIP4Config
 

 

 

@@ -887,7 +861,7 @@
 

 

 

-NMSettingIP6ConfigError, enum in NMSettingIP6Config
+NMSettingIP6ConfigError, enum in NMSettingIP6Config
 

 

 

@@ -911,7 +885,7 @@
 

 

 

-NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
+NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
 

 

 

@@ -995,7 +969,7 @@
 

 

 

-NMSettingPPPError, enum in NMSettingPPP
+NMSettingPPPError, enum in NMSettingPPP
 

 

 

@@ -1023,7 +997,7 @@
 

 

 

-NMSettingPPPOEError, enum in NMSettingPPPOE
+NMSettingPPPOEError, enum in NMSettingPPPOE
 

 

 

@@ -1059,7 +1033,7 @@
 

 

 

-NMSettingSerialError, enum in NMSettingSerial
+NMSettingSerialError, enum in NMSettingSerial
 

 

 

@@ -1091,7 +1065,7 @@
 

 

 

-NMSettingVpnError, enum in NMSettingVPN
+NMSettingVpnError, enum in NMSettingVPN
 

 

 

@@ -1111,7 +1085,7 @@
 

 

 

-NMSettingWimaxError, enum in NMSettingWimax
+NMSettingWimaxError, enum in NMSettingWimax
 

 

 

@@ -1167,7 +1141,7 @@
 

 

 

-NMSettingWiredError, enum in NMSettingWired
+NMSettingWiredError, enum in NMSettingWired
 

 

 

@@ -1231,7 +1205,7 @@
 

 

 

-NMSettingWirelessError, enum in NMSettingWireless
+NMSettingWirelessError, enum in NMSettingWireless
 

 

 

@@ -1311,7 +1285,7 @@
 

 

 

-NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
+NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
 

 

 

@@ -1363,10 +1337,6 @@
 

 

 

-NM_SETTING_802_1X_ERROR, macro in NMSetting8021x
-

-

-

 nm_setting_802_1x_error_quark, function in NMSetting8021x
 

 

@@ -1555,10 +1525,6 @@
 
 

 

-nm_setting_802_1x_get_type, function in NMSetting8021x
-

-

-

 NM_SETTING_802_1X_IDENTITY, macro in NMSetting8021x
 

 

@@ -1699,10 +1665,6 @@
 
 

 

-NM_SETTING_BLUETOOTH_ERROR, macro in NMSettingBluetooth
-

-

-

 nm_setting_bluetooth_error_quark, function in NMSettingBluetooth
 

 

@@ -1715,10 +1677,6 @@
 
 

 

-nm_setting_bluetooth_get_type, function in NMSettingBluetooth
-

-

-

 nm_setting_bluetooth_new, function in NMSettingBluetooth
 

 

@@ -1739,10 +1697,6 @@
 
 

 

-NM_SETTING_CDMA_ERROR, macro in NMSettingCdma
-

-

-

 nm_setting_cdma_error_quark, function in NMSettingCdma
 

 

@@ -1759,10 +1713,6 @@
 
 

 

-nm_setting_cdma_get_type, function in NMSettingCdma
-

-

-

 nm_setting_cdma_get_username, function in NMSettingCdma
 

 

@@ -1811,10 +1761,6 @@
 
 

 

-NM_SETTING_CONNECTION_ERROR, macro in NMSettingConnection
-

-

-

 nm_setting_connection_error_quark, function in NMSettingConnection
 

 

@@ -1847,10 +1793,6 @@
 
 

 

-nm_setting_connection_get_type, function in NMSettingConnection
-

-

-

 nm_setting_connection_get_uuid, function in NMSettingConnection
 

 

@@ -1907,10 +1849,6 @@
 
 

 

-NM_SETTING_ERROR, macro in NMSetting
-

-

-

 nm_setting_error_quark, function in NMSetting
 

 

@@ -1923,10 +1861,6 @@
 
 

 

-nm_setting_get_type, function in NMSetting
-

-

-

 NM_SETTING_GSM_ALLOWED_BANDS, macro in NMSettingGsm
 

 

@@ -1935,10 +1869,6 @@
 
 

 

-NM_SETTING_GSM_ERROR, macro in NMSettingGsm
-

-

-

 nm_setting_gsm_error_quark, function in NMSettingGsm
 

 

@@ -1983,10 +1913,6 @@
 
 

 

-nm_setting_gsm_get_type, function in NMSettingGsm
-

-

-

 nm_setting_gsm_get_username, function in NMSettingGsm
 

 

@@ -2091,10 +2017,6 @@
 
 

 

-NM_SETTING_IP4_CONFIG_ERROR, macro in NMSettingIP4Config
-

-

-

 nm_setting_ip4_config_error_quark, function in NMSettingIP4Config
 

 

@@ -2163,10 +2085,6 @@
 
 

 

-nm_setting_ip4_config_get_type, function in NMSettingIP4Config
-

-

-

 NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, macro in NMSettingIP4Config
 

 

@@ -2279,10 +2197,6 @@
 
 

 

-NM_SETTING_IP6_CONFIG_ERROR, macro in NMSettingIP6Config
-

-

-

 nm_setting_ip6_config_error_quark, function in NMSettingIP6Config
 

 

@@ -2339,10 +2253,6 @@
 
 

 

-nm_setting_ip6_config_get_type, function in NMSettingIP6Config
-

-

-

 NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, macro in NMSettingIP6Config
 

 

@@ -2435,10 +2345,6 @@
 
 

 

-NM_SETTING_OLPC_MESH_ERROR, macro in NMSettingOlpcMesh
-

-

-

 nm_setting_olpc_mesh_error_quark, function in NMSettingOlpcMesh
 

 

@@ -2455,10 +2361,6 @@
 
 

 

-nm_setting_olpc_mesh_get_type, function in NMSettingOlpcMesh
-

-

-

 nm_setting_olpc_mesh_new, function in NMSettingOlpcMesh
 

 

@@ -2487,10 +2389,6 @@
 
 

 

-NM_SETTING_PPPOE_ERROR, macro in NMSettingPPPOE
-

-

-

 nm_setting_pppoe_error_quark, function in NMSettingPPPOE
 

 

@@ -2507,10 +2405,6 @@
 
 

 

-nm_setting_pppoe_get_type, function in NMSettingPPPOE
-

-

-

 nm_setting_pppoe_get_username, function in NMSettingPPPOE
 

 

@@ -2547,10 +2441,6 @@
 
 

 

-NM_SETTING_PPP_ERROR, macro in NMSettingPPP
-

-

-

 nm_setting_ppp_error_quark, function in NMSettingPPP
 

 

@@ -2627,10 +2517,6 @@
 
 

 

-nm_setting_ppp_get_type, function in NMSettingPPP
-

-

-

 NM_SETTING_PPP_LCP_ECHO_FAILURE, macro in NMSettingPPP
 

 

@@ -2715,10 +2601,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_SERIAL_ERROR, macro in NMSettingSerial
-

-

-

 nm_setting_serial_error_quark, function in NMSettingSerial
 

 

@@ -2743,10 +2625,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_serial_get_type, function in NMSettingSerial
-

-

-

 nm_setting_serial_new, function in NMSettingSerial
 

 

@@ -2799,10 +2677,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_VPN_ERROR, macro in NMSettingVPN
-

-

-

 nm_setting_vpn_error_quark, function in NMSettingVPN
 

 

@@ -2827,10 +2701,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_vpn_get_type, function in NMSettingVPN
-

-

-

 nm_setting_vpn_get_user_name, function in NMSettingVPN
 

 

@@ -2863,10 +2733,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_WIMAX_ERROR, macro in NMSettingWimax
-

-

-

 nm_setting_wimax_error_quark, function in NMSettingWimax
 

 

@@ -2879,10 +2745,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_wimax_get_type, function in NMSettingWimax
-

-

-

 NM_SETTING_WIMAX_MAC_ADDRESS, macro in NMSettingWimax
 

 

@@ -2915,10 +2777,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_WIRED_ERROR, macro in NMSettingWired
-

-

-

 nm_setting_wired_error_quark, function in NMSettingWired
 

 

@@ -2975,10 +2833,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_wired_get_type, function in NMSettingWired
-

-

-

 NM_SETTING_WIRED_MAC_ADDRESS, macro in NMSettingWired
 

 

@@ -3047,10 +2901,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_WIRELESS_ERROR, macro in NMSettingWireless
-

-

-

 nm_setting_wireless_error_quark, function in NMSettingWireless
 

 

@@ -3111,10 +2961,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_wireless_get_type, function in NMSettingWireless
-

-

-

 NM_SETTING_WIRELESS_MAC_ADDRESS, macro in NMSettingWireless
 

 

@@ -3179,10 +3025,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-NM_SETTING_WIRELESS_SECURITY_ERROR, macro in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_error_quark, function in NMSettingWirelessSecurity
 

 

@@ -3239,10 +3081,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-nm_setting_wireless_security_get_type, function in NMSettingWirelessSecurity
-

-

-

 nm_setting_wireless_security_get_wep_key, function in NMSettingWirelessSecurity
 

 

@@ -3362,79 +3200,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 NM_SETTING_WIRELESS_TX_POWER, macro in NMSettingWireless
 
 

-
T

-

-NM_TYPE_CONNECTION_ERROR, macro in NMConnection
-

-

-

-NM_TYPE_SETTING_802_1X_ERROR, macro in NMSetting8021x
-

-

-

-NM_TYPE_SETTING_BLUETOOTH_ERROR, macro in NMSettingBluetooth
-

-

-

-NM_TYPE_SETTING_CDMA_ERROR, macro in NMSettingCdma
-

-

-

-NM_TYPE_SETTING_CONNECTION_ERROR, macro in NMSettingConnection
-

-

-

-NM_TYPE_SETTING_ERROR, macro in NMSetting
-

-

-

-NM_TYPE_SETTING_GSM_ERROR, macro in NMSettingGsm
-

-

-

-NM_TYPE_SETTING_IP4_CONFIG_ERROR, macro in NMSettingIP4Config
-

-

-

-NM_TYPE_SETTING_IP6_CONFIG_ERROR, macro in NMSettingIP6Config
-

-

-

-NM_TYPE_SETTING_OLPC_MESH_ERROR, macro in NMSettingOlpcMesh
-

-

-

-NM_TYPE_SETTING_PPPOE_ERROR, macro in NMSettingPPPOE
-

-

-

-NM_TYPE_SETTING_PPP_ERROR, macro in NMSettingPPP
-

-

-

-NM_TYPE_SETTING_SERIAL_ERROR, macro in NMSettingSerial
-

-

-

-NM_TYPE_SETTING_VPN_ERROR, macro in NMSettingVPN
-

-

-

-NM_TYPE_SETTING_WIMAX_ERROR, macro in NMSettingWimax
-

-

-

-NM_TYPE_SETTING_WIRED_ERROR, macro in NMSettingWired
-

-

-

-NM_TYPE_SETTING_WIRELESS_ERROR, macro in NMSettingWireless
-

-

-

-NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR, macro in NMSettingWirelessSecurity
-

-

 
U

 

 NMUtilsSecurityType, enum in nm-utils
@@ -3569,6 +3334,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index e21c769e..f16de7b0 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
@@ -87,6 +87,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 51f90c6a..6f6ac022 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -93,6 +93,6 @@ that require PPP to deliver IP capability
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 306a2efd..d8ff5d80 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -7,46 +7,30 @@
 
 
 
-
+
+
+
 
 
 
 
-
-
-
 
-
-
-
-
-
-
-
 
-
-
-
-
-
-
-
-
 
 
-
-
-
-
-
-
+
+
+
 
-
-
-
+
+
+
 
+
+
 
 
+
 
 
 
@@ -60,6 +44,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -72,24 +69,9 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
 
 
 
@@ -97,34 +79,46 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
 
+
 
-
-
-
-
-
+
+
 
+
+
 
+
+
+
+
 
 
 
@@ -134,36 +128,33 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
-
-
-
 
-
-
+
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
+
+
 
 
+
+
+
+
 
-
 
 
 
@@ -180,43 +171,40 @@
 
 
 
-
-
+
+
+
 
 
 
-
-
-
-
-
-
 
-
 
+
+
 
 
-
+
 
 
-
-
-
-
-
-
-
+
+
+
+
+
 
-
 
+
+
 
 
-
-
 
+
+
 
 
-
+
+
+
 
 
 
@@ -237,51 +225,48 @@
 
 
 
-
-
+
+
+
 
 
 
 
 
-
-
-
-
-
 
-
 
-
-
-
+
 
+
 
-
-
-
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
 
-
-
-
+
 
+
 
+
 
-
-
 
+
+
 
-
+
+
+
 
 
 
@@ -303,8 +288,9 @@
 
 
 
-
-
+
+
+
 
 
 
@@ -312,62 +298,58 @@
 
 
 
-
-
-
 
 
 
 
 
-
-
 
-
-
 
+
+
+
 
+
+
+
+
+
 
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
 
-
+
+
 
+
+
+
+
+
+
+
+
 
+
 
-
-
-
-
-
-
-
-
+
 
 
-
-
-
 
-
-
-
 
 
+
+
+
+
+
+
 
 
 
@@ -393,25 +375,22 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
 
+
 
 
 
-
-
-
-
+
 
 
+
 
 
 
@@ -422,29 +401,26 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
 
 
 
-
 
-
-
-
-
+
+
+
 
 
 
-
 
+
+
 
 
 
@@ -458,27 +434,24 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
 
-
 
 
-
-
-
-
+
+
+
 
-
 
 
+
+
 
 
 
@@ -491,32 +464,13 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -533,21 +487,37 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
 
 
-
+
+
+
 
-
 
-
+
+
 
 
 
@@ -567,22 +537,19 @@
 
 
 
-
-
+
+
+
 
 
 
-
-
-
-
 
-
-
-
-
-
+
+
+
 
+
+
 
 
 
@@ -593,21 +560,18 @@
 
 
 
-
-
-
-
-
-
-
-
 
 
-
-
-
+
+
+
+
+
+
 
 
+
+
 
 
 
@@ -619,6 +583,7 @@
 
 
 
+
 
 
 
@@ -628,108 +593,104 @@
 
 
 
-
-
+
+
 
 
 
-
-
-
-
-
+
 
 
 
-
-
 
-
-
+
+
+
+
 
+
+
+
 
 
 
 
-
-
 
-
-
-
-
-
 
 
 
+
 
 
+
+
+
+
+
 
-
-
-
-
-
-
+
 
-
+
+
 
-
+
+
+
 
-
-
-
-
 
 
-
-
-
-
-
-
-
-
+
+
 
 
-
-
-
+
+
+
+
+
+
+
+
 
+
+
+
 
 
-
 
 
-
-
-
-
-
-
-
-
+
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
+
 
 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
 
 
 
@@ -760,99 +721,94 @@
 
 
 
-
 
 
+
 
 
 
 
-
-
+
+
+
+
+
 
 
 
 
-
-
-
-
-
-
 
-
-
-
 
-
 
-
+
+
+
+
+
 
+
 
+
 
 
 
-
-
-
-
-
-
-
+
+
+
 
+
 
-
-
-
 
+
+
+
+
 
-
-
-
-
-
-
+
+
 
+
 
-
-
-
-
-
 
+
+
+
+
+
 
-
-
-
-
-
-
-
+
+
+
+
 
-
-
-
-
 
-
-
-
-
-
-
-
-
-
 
-
+
+
+
 
-
-
+
+
 
-
 
-
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -868,94 +824,89 @@
 
 
 
-
 
 
+
 
 
 
 
-
-
+
+
+
+
+
 
 
 
 
-
-
-
-
+
 
 
-
-
-
 
-
+
 
-
+
 
 
+
 
 
 
-
-
-
-
-
-
+
+
+
 
+
 
-
-
-
 
+
+
+
+
 
-
-
-
-
-
-
+
+
 
+
 
-
-
-
-
-
 
+
+
+
+
+
 
-
-
-
-
-
-
-
+
+
+
+
 
-
-
-
-
 
-
+
+
+
 
-
+
+
 
-
-
-
+
+
+
+
+
+
+
+
+
+
 
 
-
+
+
+
+
 
-
-
-
-
-
 
 
 
@@ -973,55 +924,52 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
+
+
+
+
+
+
+
 
-
-
-
-
-
 
 
 
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
+
+
 
+
 
 
-
-
-
+
 
 
-
-
-
-
-
-
-
+
 
 
 
@@ -1048,27 +996,24 @@
 
 
 
-
-
+
+
+
 
 
 
 
-
-
-
-
-
 
 
-
-
-
-
-
-
+
+
+
+
 
 
+
+
+
 
 
 
@@ -1081,33 +1026,30 @@
 
 
 
-
-
+
+
+
 
 
 
-
-
-
-
-
+
 
 
-
-
-
-
-
-
-
+
+
+
 
-
-
-
 
+
+
+
+
 
+
+
+
+
 
-
 
 
 
@@ -1117,14 +1059,6 @@
 
 
 
-
-
-
-
-
-
-
-
 
 
 
@@ -1135,26 +1069,34 @@
 
 
 
-
+
+
+
+
 
 
-
-
+
 
 
-
+
+
 
 
-
-
 
 
+
+
+
+
+
+
+
+
 
 
-
-
 
 
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index d4440e8d..c9aa3d53 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -40,57 +40,57 @@
 
 #include <nm-utils.h>
 
-gboolean            nm_utils_init                       (GError **error);
+enum                NMUtilsSecurityType;
 void                nm_utils_deinit                     (void);
-gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
-gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);
-char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
-void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);
-enum                NMUtilsSecurityType;
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);
+gboolean            nm_utils_init                       (GError **error);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
+guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
+guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
+guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
 GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);
 void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
                                                          GValue *value);
-guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
-guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
-guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
 GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
-GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);
-void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
-                                                         GValue *value);
 GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
 void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
                                                          GValue *value);
-char *              nm_utils_uuid_generate              (void);
-char *              nm_utils_uuid_generate_from_string  (const char *s);
+GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);
+void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
+                                                         GValue *value);
+gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);
 GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
                                                          char **out_password,
                                                          GError **error);
-guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
+gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);
+gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);
+void                nm_utils_slist_free                 (GSList *list,
+                                                         GDestroyNotify elem_destroy_fn);
+char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
+char *              nm_utils_uuid_generate              (void);
+char *              nm_utils_uuid_generate_from_string  (const char *s);
 guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
                                                          const char *band);
 guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
                                                          int direction,
                                                          char *band);
+guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
 gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);
 

@@ -105,25 +105,73 @@ access points and devices, among other things.
 

 
Details

 

-
nm_utils_init ()

-
gboolean            nm_utils_init                       (GError **error);

+
enum NMUtilsSecurityType

+
typedef enum {
+	NMU_SEC_INVALID = 0,
+	NMU_SEC_NONE,
+	NMU_SEC_STATIC_WEP,
+	NMU_SEC_LEAP,
+	NMU_SEC_DYNAMIC_WEP,
+	NMU_SEC_WPA_PSK,
+	NMU_SEC_WPA_ENTERPRISE,
+	NMU_SEC_WPA2_PSK,
+	NMU_SEC_WPA2_ENTERPRISE
+} NMUtilsSecurityType;
+

 

-Initializes libnm-util; should be called when starting and program that
-uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
-is performed, but calling nm_utils_deinit() to explicitly deinitialize
-libnm-util can also be done.  This function can be called more than once.
+Describes generic security mechanisms that 802.11 access points may offer.
+Used with nm_utils_security_valid() for checking whether a given access
+point is compatible with a network device.
 

 

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

 
 
 
error :
location to store error, or NULL
+
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
 
 

 
Returns :
TRUE if the initialization was successful, FALSE on failure.
NMU_SEC_NONE
unencrypted and open
+
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
+
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
+dynamic WEP keys automatically
+
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
+generating the dynamic WEP keys automatically
+
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
+
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
+
 

 
 

@@ -141,35 +189,6 @@ called again.
 

 

 

-
nm_utils_is_empty_ssid ()

-
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);

-

-Different manufacturers use different mechanisms for not broadcasting the
-AP's SSID.  This function attempts to detect blank/empty SSIDs using a
-number of known SSID-cloaking methods.
-

-

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


ssid :
pointer to a buffer containing the SSID data
len :
length of the SSID data in ssid
-
Returns :
TRUE if the SSID is "empty", FALSE if it is not

-

-

-

 
nm_utils_escape_ssid ()

 
const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);

@@ -201,106 +220,73 @@ and will be overwritten by subsequent calls to this function
 

 

 

-
nm_utils_same_ssid ()

-
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);

+
nm_utils_gvalue_hash_dup ()

+
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

 

-Earlier versions of the Linux kernel added a NULL byte to the end of the
-SSID to enable easy printing of the SSID on the console or in a terminal,
-but this behavior was problematic (SSIDs are simply byte arrays, not strings)
-and thus was changed.  This function compensates for that behavior at the
-cost of some compatibility with odd SSIDs that may legitimately have trailing
-NULLs, even though that is functionally pointless.
+Utility function to duplicate a hash table of GValues.
 

 

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

 
 
 
ssid1 :
first SSID data to compare
ssid2 :
second SSID data to compare
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
hash :
a GHashTable mapping string:GValue
 

 

 
Returns :
TRUE if the SSIDs are the same, FALSE if they are nota newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
+
 

 
 

 

 

 

-
nm_utils_ssid_to_utf8 ()

-
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

-

-WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
-contain embedded NULLs and other unprintable characters.  Often it is
-useful to print the SSID out for debugging purposes, but that should be the
-_only_ use of this function.  Do not use this function for any persistent
-storage of the SSID, since the printable SSID returned from this function
-cannot be converted back into the real SSID of the access point.
-

-

-This function does almost everything humanly possible to convert the input
-into a printable UTF-8 string, using roughly the following procedure:
-

-

-1) if the input data is already UTF-8 safe, no conversion is performed
-2) attempts to get the current system language from the LANG environment
-   variable, and depending on the language, uses a table of alternative
-   encodings to try.  For example, if LANG=hu_HU, the table may first try
-   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
-   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
-3) If the system language was unable to be determined, falls back to the
-   ISO-8859-1 encoding, then to the Windows-1251 encoding.
-4) If step 3 fails, replaces non-UTF-8 characters with '?'.
-

+
nm_utils_init ()

+
gboolean            nm_utils_init                       (GError **error);

 

-Again, this function should be used for debugging and display purposes
-_only_.
+Initializes libnm-util; should be called when starting and program that
+uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
+is performed, but calling nm_utils_deinit() to explicitly deinitialize
+libnm-util can also be done.  This function can be called more than once.
 

 

-
-
+
+
-
+

 
 
 
ssid :
a byte array containing the SSID data
error :
location to store error, or NULL
+
 

 

 
Returns :
an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. [transfer full]
-TRUE if the initialization was successful, FALSE on failure.
 

 
 

 

 

 

-
nm_utils_gvalue_hash_dup ()

-
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

+
nm_utils_ip4_addresses_from_gvalue ()

+
GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);

 

-Utility function to duplicate a hash table of GValues.
+Utility function to convert a GPtrArray of GArrays of guint32s representing
+a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
+and prefix) into a GSList of NMIP4Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GArray may be
+extended in the future.
 

 

-
-
+
+
-
@@ -308,213 +294,89 @@ returned hash with 
-
nm_utils_slist_free ()

-
void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);

+
nm_utils_ip4_addresses_to_gvalue ()

+
void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
+                                                         GValue *value);

-Utility function to free a GSList.
+Utility function to convert a GSList of NMIP4Address objects into a
+GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
+addresses (which is a tuple of address, gateway, and prefix).   The specific
+format of this serialization is not guaranteed to be stable and may be
+extended in the future.
 

 
 
 
hash :
a GHashTable mapping string:GValue
value :
gvalue containing a GPtrArray of GArrays of guint32s
 

 

 
Returns :
a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
+a newly allocated GSList of NMIP4Address objects. [transfer full][element-type NetworkManager.IP4Address]
 
 

 
 
 

-
-
-
-
-
-

 
 
 

 
list :
a GSList
+a list of NMIP4Address objects. [element-type NMIP4Address]
 
 

 
elem_destroy_fn :
user function called for each element in list
-

-

-

-

-
enum NMUtilsSecurityType

-
typedef enum {
-	NMU_SEC_INVALID = 0,
-	NMU_SEC_NONE,
-	NMU_SEC_STATIC_WEP,
-	NMU_SEC_LEAP,
-	NMU_SEC_DYNAMIC_WEP,
-	NMU_SEC_WPA_PSK,
-	NMU_SEC_WPA_ENTERPRISE,
-	NMU_SEC_WPA2_PSK,
-	NMU_SEC_WPA2_ENTERPRISE
-} NMUtilsSecurityType;
-

-

-Describes generic security mechanisms that 802.11 access points may offer.
-Used with nm_utils_security_valid() for checking whether a given access
-point is compatible with a network device.
-

-

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


NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
-
NMU_SEC_NONE
unencrypted and open
-
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
-
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
-dynamic WEP keys automatically
-
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
-generating the dynamic WEP keys automatically
-
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
-
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
-
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
-
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
-
value :
a pointer to a GValue into which to place the converted addresses,
+which should be unset by the caller (when no longer needed) with
+g_value_unset().
 

 
 

 

 

 

-
nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);

+
nm_utils_ip4_get_default_prefix ()

+
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

 

-Given a set of device capabilities, and a desired security type to check
-against, determines whether the combination of device, desired security
-type, and AP capabilities intersect.
+When the Internet was originally set up, various ranges of IP addresses were
+segmented into three network classes: A, B, and C.  This function will return
+a prefix that is associated with the IP address specified defining where it
+falls in the predefined classes.
 

 

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

 
 
 
type :
the security type to check AP flags and device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
-
have_ap :
whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
adhoc :
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
-
ap_wpa :
bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
ap_rsn :
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
ip :
an IPv4 address (in network byte order)
 

 

 
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are notthe default class prefix for the given IP
 

 
 

 

 

 

-
nm_utils_ip4_addresses_from_gvalue ()

-
GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);

-

-Utility function to convert a GPtrArray of GArrays of guint32s representing
-a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of NMIP4Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GArray may be
-extended in the future.
-

+
nm_utils_ip4_netmask_to_prefix ()

+
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

 

-
-
+
+
-
+

 
 
 
value :
gvalue containing a GPtrArray of GArrays of guint32s
netmask :
an IPv4 netmask in network byte order
 

 

 
Returns :
a newly allocated GSList of NMIP4Address objects. [transfer full][element-type NetworkManager.IP4Address]
-the CIDR prefix represented by the netmask
 

 
 

 

 

 

-
nm_utils_ip4_addresses_to_gvalue ()

-
void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of NMIP4Address objects into a
-GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
-addresses (which is a tuple of address, gateway, and prefix).   The specific
-format of this serialization is not guaranteed to be stable and may be
-extended in the future.
-

+
nm_utils_ip4_prefix_to_netmask ()

+
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

 

-
-
+
+
-
-
+
+

 
 
 
list :
a list of NMIP4Address objects. [element-type NMIP4Address]
-
prefix :
a CIDR prefix
 

 
value :
a pointer to a GValue into which to place the converted addresses,
-which should be unset by the caller (when no longer needed) with
-g_value_unset().
Returns :
the netmask represented by the prefix
 

 
 

@@ -576,66 +438,6 @@ which should be unset by the caller (when no longer needed) with
 

 

 

-
nm_utils_ip4_netmask_to_prefix ()

-
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

-

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


netmask :
an IPv4 netmask in network byte order
Returns :
the CIDR prefix represented by the netmask

-

-

-

-
nm_utils_ip4_prefix_to_netmask ()

-
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

-

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


prefix :
a CIDR prefix
Returns :
the netmask represented by the prefix

-

-

-

-
nm_utils_ip4_get_default_prefix ()

-
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

-

-When the Internet was originally set up, various ranges of IP addresses were
-segmented into three network classes: A, B, and C.  This function will return
-a prefix that is associated with the IP address specified defining where it
-falls in the predefined classes.
-

-

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


ip :
an IPv4 address (in network byte order)
Returns :
the default class prefix for the given IP

-

-

-

 
nm_utils_ip6_addresses_from_gvalue ()

 
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

 

@@ -691,6 +493,21 @@ which should be unset by the caller (when no longer needed) with
 

 

 

+
nm_utils_ip6_dns_from_gvalue ()

+
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

+

+

+

+

+

+
nm_utils_ip6_dns_to_gvalue ()

+
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+                                                         GValue *value);

+

+

+

+

+

 
nm_utils_ip6_routes_from_gvalue ()

 
GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);

 

@@ -747,51 +564,29 @@ which should be unset by the caller (when no longer needed) with
 

 

 

-
nm_utils_ip6_dns_from_gvalue ()

-
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

+
nm_utils_is_empty_ssid ()

+
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);

 

-

-

-

-

-
nm_utils_ip6_dns_to_gvalue ()

-
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
-                                                         GValue *value);

-

-

-

-

-

-
nm_utils_uuid_generate ()

-
char *              nm_utils_uuid_generate              (void);

-

--
-
-
-
-


Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property.  Should be freed with g_free()
-

-

-

-

-
nm_utils_uuid_generate_from_string ()

-
char *              nm_utils_uuid_generate_from_string  (const char *s);

-

-For a given s, this function will always return the same UUID.
+Different manufacturers use different mechanisms for not broadcasting the
+AP's SSID.  This function attempts to detect blank/empty SSIDs using a
+number of known SSID-cloaking methods.
 

 

-
-
+
+
+
+
+
+
-
+

 
 
 
s :
a string to use as the seed for the UUID
ssid :
pointer to a buffer containing the SSID data
len :
length of the SSID data in ssid
+
 

 

 
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": propertyTRUE if the SSID is "empty", FALSE if it is not
 

 
 

@@ -841,21 +636,205 @@ certificate/private key file. [
-
nm_utils_wifi_freq_to_channel ()

-
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

+
nm_utils_same_ssid ()

+
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);

 

-Utility function to translate a WiFi frequency to its corresponding channel.
+Earlier versions of the Linux kernel added a NULL byte to the end of the
+SSID to enable easy printing of the SSID on the console or in a terminal,
+but this behavior was problematic (SSIDs are simply byte arrays, not strings)
+and thus was changed.  This function compensates for that behavior at the
+cost of some compatibility with odd SSIDs that may legitimately have trailing
+NULLs, even though that is functionally pointless.
 

 

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

 
 
 
freq :
frequency
ssid1 :
first SSID data to compare
ssid2 :
second SSID data to compare
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
 

 

 
Returns :
the channel represented by the frequency or 0TRUE if the SSIDs are the same, FALSE if they are not

+

+

+

+
nm_utils_security_valid ()

+
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);

+

+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device, desired security
+type, and AP capabilities intersect.
+

+

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


type :
the security type to check AP flags and device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
have_ap :
whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
adhoc :
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
+
ap_wpa :
bitfield of AP capabilties derived from the AP's WPA beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
ap_rsn :
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type, FALSE if they are not

+

+

+

+
nm_utils_slist_free ()

+
void                nm_utils_slist_free                 (GSList *list,
+                                                         GDestroyNotify elem_destroy_fn);

+

+Utility function to free a GSList.
+

+

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


list :
a GSList
+
elem_destroy_fn :
user function called for each element in list
+

+

+

+

+
nm_utils_ssid_to_utf8 ()

+
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

+

+WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
+contain embedded NULLs and other unprintable characters.  Often it is
+useful to print the SSID out for debugging purposes, but that should be the
+_only_ use of this function.  Do not use this function for any persistent
+storage of the SSID, since the printable SSID returned from this function
+cannot be converted back into the real SSID of the access point.
+

+

+This function does almost everything humanly possible to convert the input
+into a printable UTF-8 string, using roughly the following procedure:
+

+

+1) if the input data is already UTF-8 safe, no conversion is performed
+2) attempts to get the current system language from the LANG environment
+   variable, and depending on the language, uses a table of alternative
+   encodings to try.  For example, if LANG=hu_HU, the table may first try
+   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
+   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
+3) If the system language was unable to be determined, falls back to the
+   ISO-8859-1 encoding, then to the Windows-1251 encoding.
+4) If step 3 fails, replaces non-UTF-8 characters with '?'.
+

+

+Again, this function should be used for debugging and display purposes
+_only_.
+

+

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


ssid :
a byte array containing the SSID data
Returns :
an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. [transfer full]
+

+

+

+

+
nm_utils_uuid_generate ()

+
char *              nm_utils_uuid_generate              (void);

+

++
+
+
+
+


Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property.  Should be freed with g_free()
+

+

+

+

+
nm_utils_uuid_generate_from_string ()

+
char *              nm_utils_uuid_generate_from_string  (const char *s);

+

+For a given s, this function will always return the same UUID.
+

+

++
+
+
+
+
+
+
+


s :
a string to use as the seed for the UUID
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property
 

 
 

@@ -921,6 +900,27 @@ Utility function to find out next/previous WiFi channel for a channel.
 

 

 

+
nm_utils_wifi_freq_to_channel ()

+
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

+

+Utility function to translate a WiFi frequency to its corresponding channel.
+

+

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


freq :
frequency
Returns :
the channel represented by the frequency or 0

+

+

+

 
nm_utils_wifi_is_channel_valid ()

 
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);

@@ -949,6 +949,6 @@ Utility function to verify WiFi channel validity.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp b/docs/libnm-util/html/libnm-util.devhelp
deleted file mode 100644
index 7e48f817..00000000
--- a/docs/libnm-util/html/libnm-util.devhelp
+++ /dev/null
@@ -1,911 +0,0 @@
-
-
-
-  
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 3c4ec11b..021b34e1 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -28,42 +28,26 @@
     
   
   
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
-    
+    
+    
+    
     
+    
+    
     
     
+    
     
     
     
@@ -77,69 +61,76 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
+    
     
-    
-    
-    
-    
-    
+    
+    
     
+    
+    
     
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
+    
     
     
+    
+    
+    
+    
     
-    
     
     
     
@@ -148,40 +139,37 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
     
+    
+    
     
     
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
     
+    
+    
     
     
-    
-    
     
+    
+    
     
     
-    
+    
+    
+    
     
     
     
@@ -194,46 +182,43 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
     
+    
     
-    
-    
-    
+    
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
     
+    
     
+    
     
-    
-    
     
+    
+    
     
-    
+    
+    
+    
     
     
     
@@ -247,60 +232,57 @@
     
     
     
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
     
-    
-    
     
+    
+    
+    
     
+    
+    
+    
+    
+    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
     
-    
-    
-    
     
-    
-    
-    
     
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -318,101 +300,89 @@
     
     
     
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
     
     
-    
-    
-    
-    
+    
     
     
+    
     
     
-    
-    
-    
-    
-    
+    
+    
+    
     
     
     
-    
     
-    
-    
-    
-    
+    
+    
+    
     
     
     
-    
     
+    
+    
     
     
     
     
     
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
     
     
-    
-    
-    
-    
+    
+    
+    
     
-    
     
     
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
+    
     
     
-    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
+    
     
     
-    
+    
+    
+    
     
-    
     
-    
+    
+    
     
     
     
@@ -424,140 +394,131 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
     
     
     
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
     
     
-    
-    
     
-    
-    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
     
-    
-    
     
-    
-    
-    
-    
-    
     
     
     
+    
     
     
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
+    
     
-    
+    
+    
     
-    
+    
+    
+    
     
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
-    
+    
     
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
     
     
     
@@ -585,88 +546,83 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
-    
-    
     
-    
     
-    
+    
+    
+    
+    
+    
     
+    
     
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
-    
-    
-    
     
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
-    
-    
-    
-    
-    
     
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
+    
+    
+    
     
-    
-    
+    
+    
     
-    
     
-    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -679,83 +635,78 @@
     
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
     
-    
+    
     
-    
+    
     
     
+    
     
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
-    
-    
-    
     
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
-    
-    
-    
-    
-    
     
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
     
-    
+    
+    
+    
     
-    
+    
+    
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
     
     
     
@@ -765,51 +716,48 @@
     
     
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
     
     
     
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
+    
     
+    
     
     
-    
-    
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
     
     
     
@@ -828,109 +776,103 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
+    
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
-    
-    
     
+    
+    
+    
+    
     
+    
+    
+    
+    
     
-    
     
     
     
     
-    
+    
     
-    
     
-    
-    
     
-    
-    
-    
+    
     
     
-    
-    
+    
     
     
-    
+    
+    
     
     
-    
-    
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
     
     
+    
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
     
     
     
-    
-    
-    
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -970,11 +912,6 @@
     
     
     
-    
-    
-    
-    
-    
     
     
     
@@ -990,6 +927,11 @@
     
     
     
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index a67b1874..e0e26418 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -70,6 +70,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index 8a3cf261..2977214c 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1,969 +1,969 @@
 

-nm-setting-gsm
-NMSettingGsm
-NM_SETTING_GSM_SETTING_NAME
-NMSettingGsmError
-NM_TYPE_SETTING_GSM_ERROR
-NM_SETTING_GSM_ERROR
-nm_setting_gsm_error_quark
-NM_SETTING_GSM_NUMBER
-NM_SETTING_GSM_USERNAME
-NM_SETTING_GSM_PASSWORD
-NM_SETTING_GSM_PASSWORD_FLAGS
-NM_SETTING_GSM_APN
-NM_SETTING_GSM_NETWORK_ID
-NM_SETTING_GSM_NETWORK_TYPE
-NM_SETTING_GSM_ALLOWED_BANDS
-NM_SETTING_GSM_PIN
-NM_SETTING_GSM_PIN_FLAGS
-NM_SETTING_GSM_HOME_ONLY
-NMSettingGsmNetworkType
-NMSettingGsmNetworkBand
-NMSettingGsm
-NMSettingGsmClass
-nm_setting_gsm_get_type
-nm_setting_gsm_new
-nm_setting_gsm_get_number
-nm_setting_gsm_get_username
-nm_setting_gsm_get_password
-nm_setting_gsm_get_apn
-nm_setting_gsm_get_network_id
-nm_setting_gsm_get_network_type
-nm_setting_gsm_get_allowed_bands
-nm_setting_gsm_get_pin
-nm_setting_gsm_get_home_only
-nm_setting_gsm_get_pin_flags
-nm_setting_gsm_get_password_flags
+nm-connection
+NMConnection
+NMConnection
+NMConnectionClass
+NMConnectionError
+NM_CONNECTION_PATH
+nm_connection_add_setting
+nm_connection_clear_secrets
+nm_connection_clear_secrets_with_flags
+nm_connection_compare
+nm_connection_create_setting
+nm_connection_diff
+nm_connection_dump
+nm_connection_duplicate
+nm_connection_error_quark
+nm_connection_for_each_setting_value
+nm_connection_get_id
+nm_connection_get_path
+nm_connection_get_setting
+nm_connection_get_setting_802_1x
+nm_connection_get_setting_bluetooth
+nm_connection_get_setting_by_name
+nm_connection_get_setting_cdma
+nm_connection_get_setting_connection
+nm_connection_get_setting_gsm
+nm_connection_get_setting_ip4_config
+nm_connection_get_setting_ip6_config
+nm_connection_get_setting_olpc_mesh
+nm_connection_get_setting_ppp
+nm_connection_get_setting_pppoe
+nm_connection_get_setting_vpn
+nm_connection_get_setting_wimax
+nm_connection_get_setting_wired
+nm_connection_get_setting_wireless
+nm_connection_get_setting_wireless_security
+nm_connection_get_uuid
+nm_connection_is_type
+nm_connection_lookup_setting_type
+nm_connection_lookup_setting_type_by_quark
+nm_connection_need_secrets
+nm_connection_new
+nm_connection_new_from_hash
+nm_connection_remove_setting
+nm_connection_replace_settings
+nm_connection_set_path
+nm_connection_to_hash
+nm_connection_update_secrets
+nm_connection_verify
 
-NM_SETTING_GSM
-NM_IS_SETTING_GSM
-NM_TYPE_SETTING_GSM
-nm_setting_gsm_error_get_type
-NM_SETTING_GSM_CLASS
-NM_IS_SETTING_GSM_CLASS
-NM_SETTING_GSM_GET_CLASS
+NM_CONNECTION
+NM_CONNECTION_CLASS
+NM_CONNECTION_ERROR
+NM_CONNECTION_GET_CLASS
+NM_IS_CONNECTION
+NM_IS_CONNECTION_CLASS
+NM_TYPE_CONNECTION
+NM_TYPE_CONNECTION_ERROR
+nm_connection_error_get_type
+nm_connection_get_type
+

+
+

+nm-setting
+NMSetting
+NMSetting
+NMSettingClass
+NMSettingClearSecretsWithFlagsFn
+NMSettingCompareFlags
+NMSettingDiffResult
+NMSettingError
+NMSettingHashFlags
+NMSettingSecretFlags
+NMSettingValueIterFn
+NM_SETTING_NAME
+NM_SETTING_PARAM_FUZZY_IGNORE
+NM_SETTING_PARAM_REQUIRED
+NM_SETTING_PARAM_SECRET
+NM_SETTING_PARAM_SERIALIZE
+nm_setting_clear_secrets
+nm_setting_clear_secrets_with_flags
+nm_setting_compare
+nm_setting_diff
+nm_setting_duplicate
+nm_setting_enumerate_values
+nm_setting_error_quark
+nm_setting_get_name
+nm_setting_get_secret_flags
+nm_setting_need_secrets
+nm_setting_new_from_hash
+nm_setting_set_secret_flags
+nm_setting_to_hash
+nm_setting_to_string
+nm_setting_update_secrets
+nm_setting_verify
+
+NM_IS_SETTING
+NM_IS_SETTING_CLASS
+NM_SETTING
+NM_SETTING_CLASS
+NM_SETTING_ERROR
+NM_SETTING_GET_CLASS
+NM_TYPE_SETTING
+NM_TYPE_SETTING_ERROR
+nm_setting_error_get_type
+nm_setting_get_type
 

 
 

 nm-setting-8021x
 NMSetting8021x
+NMSetting8021x
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
-NM_SETTING_802_1X_SETTING_NAME
+NMSetting8021xClass
 NMSetting8021xError
-NM_TYPE_SETTING_802_1X_ERROR
-NM_SETTING_802_1X_ERROR
-nm_setting_802_1x_error_quark
-NM_SETTING_802_1X_EAP
-NM_SETTING_802_1X_IDENTITY
+NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_ANONYMOUS_IDENTITY
 NM_SETTING_802_1X_CA_CERT
 NM_SETTING_802_1X_CA_PATH
-NM_SETTING_802_1X_SUBJECT_MATCH
-NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_CLIENT_CERT
-NM_SETTING_802_1X_PHASE1_PEAPVER
-NM_SETTING_802_1X_PHASE1_PEAPLABEL
+NM_SETTING_802_1X_EAP
+NM_SETTING_802_1X_IDENTITY
+NM_SETTING_802_1X_PASSWORD
+NM_SETTING_802_1X_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
+NM_SETTING_802_1X_PHASE1_PEAPLABEL
+NM_SETTING_802_1X_PHASE1_PEAPVER
+NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_PHASE2_AUTH
 NM_SETTING_802_1X_PHASE2_AUTHEAP
 NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
-NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
-NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
-NM_SETTING_802_1X_PASSWORD
-NM_SETTING_802_1X_PASSWORD_FLAGS
-NM_SETTING_802_1X_PRIVATE_KEY
-NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
+NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_FLAGS
+NM_SETTING_802_1X_PRIVATE_KEY
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
+NM_SETTING_802_1X_SETTING_NAME
+NM_SETTING_802_1X_SUBJECT_MATCH
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
-NMSetting8021x
-NMSetting8021xClass
-nm_setting_802_1x_get_type
-nm_setting_802_1x_new
-nm_setting_802_1x_get_num_eap_methods
-nm_setting_802_1x_get_eap_method
+nm_setting_802_1x_add_altsubject_match
 nm_setting_802_1x_add_eap_method
-nm_setting_802_1x_remove_eap_method
+nm_setting_802_1x_add_phase2_altsubject_match
+nm_setting_802_1x_clear_altsubject_matches
 nm_setting_802_1x_clear_eap_methods
-nm_setting_802_1x_get_identity
+nm_setting_802_1x_clear_phase2_altsubject_matches
+nm_setting_802_1x_error_quark
+nm_setting_802_1x_get_altsubject_match
 nm_setting_802_1x_get_anonymous_identity
-nm_setting_802_1x_get_system_ca_certs
-nm_setting_802_1x_get_ca_path
-nm_setting_802_1x_get_phase2_ca_path
-nm_setting_802_1x_get_ca_cert_scheme
 nm_setting_802_1x_get_ca_cert_blob
 nm_setting_802_1x_get_ca_cert_path
-nm_setting_802_1x_set_ca_cert
-nm_setting_802_1x_get_subject_match
-nm_setting_802_1x_get_num_altsubject_matches
-nm_setting_802_1x_get_altsubject_match
-nm_setting_802_1x_add_altsubject_match
-nm_setting_802_1x_remove_altsubject_match
-nm_setting_802_1x_clear_altsubject_matches
-nm_setting_802_1x_get_client_cert_scheme
+nm_setting_802_1x_get_ca_cert_scheme
+nm_setting_802_1x_get_ca_path
 nm_setting_802_1x_get_client_cert_blob
 nm_setting_802_1x_get_client_cert_path
-nm_setting_802_1x_set_client_cert
-nm_setting_802_1x_get_phase1_peapver
-nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_get_client_cert_scheme
+nm_setting_802_1x_get_eap_method
+nm_setting_802_1x_get_identity
+nm_setting_802_1x_get_num_altsubject_matches
+nm_setting_802_1x_get_num_eap_methods
+nm_setting_802_1x_get_num_phase2_altsubject_matches
+nm_setting_802_1x_get_password
+nm_setting_802_1x_get_password_flags
 nm_setting_802_1x_get_phase1_fast_provisioning
+nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_get_phase1_peapver
+nm_setting_802_1x_get_phase2_altsubject_match
 nm_setting_802_1x_get_phase2_auth
 nm_setting_802_1x_get_phase2_autheap
-nm_setting_802_1x_get_phase2_ca_cert_scheme
 nm_setting_802_1x_get_phase2_ca_cert_blob
 nm_setting_802_1x_get_phase2_ca_cert_path
-nm_setting_802_1x_set_phase2_ca_cert
-nm_setting_802_1x_get_phase2_subject_match
-nm_setting_802_1x_get_num_phase2_altsubject_matches
-nm_setting_802_1x_get_phase2_altsubject_match
-nm_setting_802_1x_add_phase2_altsubject_match
-nm_setting_802_1x_remove_phase2_altsubject_match
-nm_setting_802_1x_clear_phase2_altsubject_matches
-nm_setting_802_1x_get_phase2_client_cert_scheme
+nm_setting_802_1x_get_phase2_ca_cert_scheme
+nm_setting_802_1x_get_phase2_ca_path
 nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
-nm_setting_802_1x_set_phase2_client_cert
-nm_setting_802_1x_get_password
-nm_setting_802_1x_get_password_flags
+nm_setting_802_1x_get_phase2_client_cert_scheme
+nm_setting_802_1x_get_phase2_private_key_blob
+nm_setting_802_1x_get_phase2_private_key_format
+nm_setting_802_1x_get_phase2_private_key_password
+nm_setting_802_1x_get_phase2_private_key_password_flags
+nm_setting_802_1x_get_phase2_private_key_path
+nm_setting_802_1x_get_phase2_private_key_scheme
+nm_setting_802_1x_get_phase2_subject_match
 nm_setting_802_1x_get_pin
 nm_setting_802_1x_get_pin_flags
-nm_setting_802_1x_get_private_key_scheme
 nm_setting_802_1x_get_private_key_blob
-nm_setting_802_1x_get_private_key_path
-nm_setting_802_1x_set_private_key
+nm_setting_802_1x_get_private_key_format
 nm_setting_802_1x_get_private_key_password
 nm_setting_802_1x_get_private_key_password_flags
-nm_setting_802_1x_get_private_key_format
-nm_setting_802_1x_get_phase2_private_key_scheme
-nm_setting_802_1x_get_phase2_private_key_blob
-nm_setting_802_1x_get_phase2_private_key_path
-nm_setting_802_1x_set_phase2_private_key
-nm_setting_802_1x_get_phase2_private_key_password
-nm_setting_802_1x_get_phase2_private_key_password_flags
-nm_setting_802_1x_get_phase2_private_key_format
-
-NM_SETTING_802_1X
+nm_setting_802_1x_get_private_key_path
+nm_setting_802_1x_get_private_key_scheme
+nm_setting_802_1x_get_subject_match
+nm_setting_802_1x_get_system_ca_certs
+nm_setting_802_1x_new
+nm_setting_802_1x_remove_altsubject_match
+nm_setting_802_1x_remove_eap_method
+nm_setting_802_1x_remove_phase2_altsubject_match
+nm_setting_802_1x_set_ca_cert
+nm_setting_802_1x_set_client_cert
+nm_setting_802_1x_set_phase2_ca_cert
+nm_setting_802_1x_set_phase2_client_cert
+nm_setting_802_1x_set_phase2_private_key
+nm_setting_802_1x_set_private_key
+
 NM_IS_SETTING_802_1X
-NM_TYPE_SETTING_802_1X
-nm_setting_802_1x_error_get_type
-NM_SETTING_802_1X_CLASS
 NM_IS_SETTING_802_1X_CLASS
+NM_SETTING_802_1X
+NM_SETTING_802_1X_CLASS
+NM_SETTING_802_1X_ERROR
 NM_SETTING_802_1X_GET_CLASS
+NM_TYPE_SETTING_802_1X
+NM_TYPE_SETTING_802_1X_ERROR
+nm_setting_802_1x_error_get_type
+nm_setting_802_1x_get_type
 

 
 

 nm-setting-bluetooth
 NMSettingBluetooth
-NM_SETTING_BLUETOOTH_SETTING_NAME
+NMSettingBluetooth
+NMSettingBluetoothClass
 NMSettingBluetoothError
-NM_TYPE_SETTING_BLUETOOTH_ERROR
-NM_SETTING_BLUETOOTH_ERROR
-nm_setting_bluetooth_error_quark
 NM_SETTING_BLUETOOTH_BDADDR
+NM_SETTING_BLUETOOTH_SETTING_NAME
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
 NM_SETTING_BLUETOOTH_TYPE_PANU
-NMSettingBluetooth
-NMSettingBluetoothClass
-nm_setting_bluetooth_get_type
-nm_setting_bluetooth_new
+nm_setting_bluetooth_error_quark
 nm_setting_bluetooth_get_bdaddr
 nm_setting_bluetooth_get_connection_type
+nm_setting_bluetooth_new
 
-NM_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH
-NM_TYPE_SETTING_BLUETOOTH
-nm_setting_bluetooth_error_get_type
-NM_SETTING_BLUETOOTH_CLASS
 NM_IS_SETTING_BLUETOOTH_CLASS
+NM_SETTING_BLUETOOTH
+NM_SETTING_BLUETOOTH_CLASS
+NM_SETTING_BLUETOOTH_ERROR
 NM_SETTING_BLUETOOTH_GET_CLASS
-

-
-

-nm-setting-olpc-mesh
-NMSettingOlpcMesh
-NM_SETTING_OLPC_MESH_SETTING_NAME
-NMSettingOlpcMeshError
-NM_TYPE_SETTING_OLPC_MESH_ERROR
-NM_SETTING_OLPC_MESH_ERROR
-nm_setting_olpc_mesh_error_quark
-NM_SETTING_OLPC_MESH_SSID
-NM_SETTING_OLPC_MESH_CHANNEL
-NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-NMSettingOlpcMesh
-NMSettingOlpcMeshClass
-nm_setting_olpc_mesh_get_type
-nm_setting_olpc_mesh_new
-nm_setting_olpc_mesh_get_ssid
-nm_setting_olpc_mesh_get_channel
-nm_setting_olpc_mesh_get_dhcp_anycast_address
-
-NM_SETTING_OLPC_MESH
-NM_IS_SETTING_OLPC_MESH
-NM_TYPE_SETTING_OLPC_MESH
-nm_setting_olpc_mesh_error_get_type
-NM_SETTING_OLPC_MESH_CLASS
-NM_IS_SETTING_OLPC_MESH_CLASS
-NM_SETTING_OLPC_MESH_GET_CLASS
+NM_TYPE_SETTING_BLUETOOTH
+NM_TYPE_SETTING_BLUETOOTH_ERROR
+nm_setting_bluetooth_error_get_type
+nm_setting_bluetooth_get_type
 

 
 

 nm-setting-cdma
 NMSettingCdma
-NM_SETTING_CDMA_SETTING_NAME
+NMSettingCdma
+NMSettingCdmaClass
 NMSettingCdmaError
-NM_TYPE_SETTING_CDMA_ERROR
-NM_SETTING_CDMA_ERROR
-nm_setting_cdma_error_quark
 NM_SETTING_CDMA_NUMBER
-NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
-NMSettingCdma
-NMSettingCdmaClass
-nm_setting_cdma_get_type
-nm_setting_cdma_new
+NM_SETTING_CDMA_SETTING_NAME
+NM_SETTING_CDMA_USERNAME
+nm_setting_cdma_error_quark
 nm_setting_cdma_get_number
-nm_setting_cdma_get_username
 nm_setting_cdma_get_password
 nm_setting_cdma_get_password_flags
+nm_setting_cdma_get_username
+nm_setting_cdma_new
 
-NM_SETTING_CDMA
 NM_IS_SETTING_CDMA
-NM_TYPE_SETTING_CDMA
-nm_setting_cdma_error_get_type
-NM_SETTING_CDMA_CLASS
 NM_IS_SETTING_CDMA_CLASS
+NM_SETTING_CDMA
+NM_SETTING_CDMA_CLASS
+NM_SETTING_CDMA_ERROR
 NM_SETTING_CDMA_GET_CLASS
+NM_TYPE_SETTING_CDMA
+NM_TYPE_SETTING_CDMA_ERROR
+nm_setting_cdma_error_get_type
+nm_setting_cdma_get_type
 

 
 

-nm-setting-serial
-NMSettingSerial
-NM_SETTING_SERIAL_SETTING_NAME
-NMSettingSerialError
-NM_TYPE_SETTING_SERIAL_ERROR
-NM_SETTING_SERIAL_ERROR
-nm_setting_serial_error_quark
-NM_SETTING_SERIAL_BAUD
-NM_SETTING_SERIAL_BITS
-NM_SETTING_SERIAL_PARITY
-NM_SETTING_SERIAL_STOPBITS
-NM_SETTING_SERIAL_SEND_DELAY
-NMSettingSerial
-NMSettingSerialClass
-nm_setting_serial_get_type
-nm_setting_serial_new
-nm_setting_serial_get_baud
-nm_setting_serial_get_bits
-nm_setting_serial_get_parity
-nm_setting_serial_get_stopbits
-nm_setting_serial_get_send_delay
-
-NM_SETTING_SERIAL
-NM_IS_SETTING_SERIAL
-NM_TYPE_SETTING_SERIAL
-nm_setting_serial_error_get_type
-NM_SETTING_SERIAL_CLASS
-NM_IS_SETTING_SERIAL_CLASS
-NM_SETTING_SERIAL_GET_CLASS
-

-
-

-nm-setting-wireless-security
-NMSettingWirelessSecurity
-NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
-NMSettingWirelessSecurityError
-NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
-NM_SETTING_WIRELESS_SECURITY_ERROR
-nm_setting_wireless_security_error_quark
-NMWepKeyType
-NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
-NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-NM_SETTING_WIRELESS_SECURITY_PROTO
-NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-NM_SETTING_WIRELESS_SECURITY_GROUP
-NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
-NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
-NM_SETTING_WIRELESS_SECURITY_PSK
-NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
-NMSettingWirelessSecurity
-NMSettingWirelessSecurityClass
-nm_setting_wireless_security_get_type
-nm_setting_wireless_security_new
-nm_setting_wireless_security_get_key_mgmt
-nm_setting_wireless_security_get_num_protos
-nm_setting_wireless_security_get_proto
-nm_setting_wireless_security_add_proto
-nm_setting_wireless_security_remove_proto
-nm_setting_wireless_security_clear_protos
-nm_setting_wireless_security_get_num_pairwise
-nm_setting_wireless_security_get_pairwise
-nm_setting_wireless_security_add_pairwise
-nm_setting_wireless_security_remove_pairwise
-nm_setting_wireless_security_clear_pairwise
-nm_setting_wireless_security_get_num_groups
-nm_setting_wireless_security_get_group
-nm_setting_wireless_security_add_group
-nm_setting_wireless_security_remove_group
-nm_setting_wireless_security_clear_groups
-nm_setting_wireless_security_get_psk
-nm_setting_wireless_security_get_psk_flags
-nm_setting_wireless_security_get_leap_username
-nm_setting_wireless_security_get_leap_password
-nm_setting_wireless_security_get_leap_password_flags
-nm_setting_wireless_security_get_wep_key
-nm_setting_wireless_security_set_wep_key
-nm_setting_wireless_security_get_wep_tx_keyidx
-nm_setting_wireless_security_get_auth_alg
-nm_setting_wireless_security_get_wep_key_flags
-nm_setting_wireless_security_get_wep_key_type
+nm-setting-connection
+NMSettingConnection
+NMSettingConnection
+NMSettingConnectionClass
+NMSettingConnectionError
+NM_SETTING_CONNECTION_AUTOCONNECT
+NM_SETTING_CONNECTION_ID
+NM_SETTING_CONNECTION_PERMISSIONS
+NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_SETTING_NAME
+NM_SETTING_CONNECTION_TIMESTAMP
+NM_SETTING_CONNECTION_TYPE
+NM_SETTING_CONNECTION_UUID
+nm_setting_connection_add_permission
+nm_setting_connection_error_quark
+nm_setting_connection_get_autoconnect
+nm_setting_connection_get_connection_type
+nm_setting_connection_get_id
+nm_setting_connection_get_num_permissions
+nm_setting_connection_get_permission
+nm_setting_connection_get_read_only
+nm_setting_connection_get_timestamp
+nm_setting_connection_get_uuid
+nm_setting_connection_new
+nm_setting_connection_permissions_user_allowed
+nm_setting_connection_remove_permission
 
-NM_SETTING_WIRELESS_SECURITY
-NM_IS_SETTING_WIRELESS_SECURITY
-NM_TYPE_SETTING_WIRELESS_SECURITY
-nm_setting_wireless_security_error_get_type
-NM_SETTING_WIRELESS_SECURITY_CLASS
-NM_IS_SETTING_WIRELESS_SECURITY_CLASS
-NM_SETTING_WIRELESS_SECURITY_GET_CLASS
+NM_IS_SETTING_CONNECTION
+NM_IS_SETTING_CONNECTION_CLASS
+NM_SETTING_CONNECTION
+NM_SETTING_CONNECTION_CLASS
+NM_SETTING_CONNECTION_ERROR
+NM_SETTING_CONNECTION_GET_CLASS
+NM_TYPE_SETTING_CONNECTION
+NM_TYPE_SETTING_CONNECTION_ERROR
+nm_setting_connection_error_get_type
+nm_setting_connection_get_type
 

 
 

-nm-setting-ip6-config
-NMSettingIP6Config
-NM_SETTING_IP6_CONFIG_SETTING_NAME
-NMSettingIP6ConfigError
-NM_TYPE_SETTING_IP6_CONFIG_ERROR
-NM_SETTING_IP6_CONFIG_ERROR
-nm_setting_ip6_config_error_quark
-NM_SETTING_IP6_CONFIG_METHOD
-NM_SETTING_IP6_CONFIG_DNS
-NM_SETTING_IP6_CONFIG_DNS_SEARCH
-NM_SETTING_IP6_CONFIG_ADDRESSES
-NM_SETTING_IP6_CONFIG_ROUTES
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
-NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP6_CONFIG_MAY_FAIL
-NM_SETTING_IP6_CONFIG_METHOD_IGNORE
-NM_SETTING_IP6_CONFIG_METHOD_AUTO
-NM_SETTING_IP6_CONFIG_METHOD_DHCP
-NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
-NM_SETTING_IP6_CONFIG_METHOD_MANUAL
-NM_SETTING_IP6_CONFIG_METHOD_SHARED
-NMIP6Address
-nm_ip6_address_get_type
-nm_ip6_address_new
-nm_ip6_address_dup
-nm_ip6_address_ref
-nm_ip6_address_unref
-nm_ip6_address_compare
-nm_ip6_address_get_address
-nm_ip6_address_set_address
-nm_ip6_address_get_prefix
-nm_ip6_address_set_prefix
-nm_ip6_address_get_gateway
-nm_ip6_address_set_gateway
-NMIP6Route
-nm_ip6_route_get_type
-nm_ip6_route_new
-nm_ip6_route_dup
-nm_ip6_route_ref
-nm_ip6_route_unref
-nm_ip6_route_compare
-nm_ip6_route_get_dest
-nm_ip6_route_set_dest
-nm_ip6_route_get_prefix
-nm_ip6_route_set_prefix
-nm_ip6_route_get_next_hop
-nm_ip6_route_set_next_hop
-nm_ip6_route_get_metric
-nm_ip6_route_set_metric
-NMSettingIP6Config
-NMSettingIP6ConfigClass
-nm_setting_ip6_config_get_type
-nm_setting_ip6_config_new
-nm_setting_ip6_config_get_method
-nm_setting_ip6_config_get_num_dns
-nm_setting_ip6_config_get_dns
-nm_setting_ip6_config_add_dns
-nm_setting_ip6_config_remove_dns
-nm_setting_ip6_config_clear_dns
-nm_setting_ip6_config_get_num_dns_searches
-nm_setting_ip6_config_get_dns_search
-nm_setting_ip6_config_add_dns_search
-nm_setting_ip6_config_remove_dns_search
-nm_setting_ip6_config_clear_dns_searches
-nm_setting_ip6_config_get_num_addresses
-nm_setting_ip6_config_get_address
-nm_setting_ip6_config_add_address
-nm_setting_ip6_config_remove_address
-nm_setting_ip6_config_clear_addresses
-nm_setting_ip6_config_get_num_routes
-nm_setting_ip6_config_get_route
-nm_setting_ip6_config_add_route
-nm_setting_ip6_config_remove_route
-nm_setting_ip6_config_clear_routes
-nm_setting_ip6_config_get_ignore_auto_routes
-nm_setting_ip6_config_get_ignore_auto_dns
-nm_setting_ip6_config_get_never_default
-nm_setting_ip6_config_get_may_fail
-
-NM_SETTING_IP6_CONFIG
-NM_IS_SETTING_IP6_CONFIG
-NM_TYPE_SETTING_IP6_CONFIG
-nm_setting_ip6_config_error_get_type
-NM_SETTING_IP6_CONFIG_CLASS
-NM_IS_SETTING_IP6_CONFIG_CLASS
-NM_SETTING_IP6_CONFIG_GET_CLASS
-

-
-

-nm-setting-wimax
-NMSettingWimax
-NM_SETTING_WIMAX_SETTING_NAME
-NMSettingWimaxError
-NM_TYPE_SETTING_WIMAX_ERROR
-NM_SETTING_WIMAX_ERROR
-nm_setting_wimax_error_quark
-NM_SETTING_WIMAX_NETWORK_NAME
-NM_SETTING_WIMAX_MAC_ADDRESS
-NMSettingWimax
-NMSettingWimaxClass
-nm_setting_wimax_get_type
-nm_setting_wimax_new
-nm_setting_wimax_get_network_name
-nm_setting_wimax_get_mac_address
+nm-setting-gsm
+NMSettingGsm
+NMSettingGsm
+NMSettingGsmClass
+NMSettingGsmError
+NMSettingGsmNetworkBand
+NMSettingGsmNetworkType
+NM_SETTING_GSM_ALLOWED_BANDS
+NM_SETTING_GSM_APN
+NM_SETTING_GSM_HOME_ONLY
+NM_SETTING_GSM_NETWORK_ID
+NM_SETTING_GSM_NETWORK_TYPE
+NM_SETTING_GSM_NUMBER
+NM_SETTING_GSM_PASSWORD
+NM_SETTING_GSM_PASSWORD_FLAGS
+NM_SETTING_GSM_PIN
+NM_SETTING_GSM_PIN_FLAGS
+NM_SETTING_GSM_SETTING_NAME
+NM_SETTING_GSM_USERNAME
+nm_setting_gsm_error_quark
+nm_setting_gsm_get_allowed_bands
+nm_setting_gsm_get_apn
+nm_setting_gsm_get_home_only
+nm_setting_gsm_get_network_id
+nm_setting_gsm_get_network_type
+nm_setting_gsm_get_number
+nm_setting_gsm_get_password
+nm_setting_gsm_get_password_flags
+nm_setting_gsm_get_pin
+nm_setting_gsm_get_pin_flags
+nm_setting_gsm_get_username
+nm_setting_gsm_new
 
-NM_SETTING_WIMAX
-NM_IS_SETTING_WIMAX
-NM_TYPE_SETTING_WIMAX
-nm_setting_wimax_error_get_type
-NM_SETTING_WIMAX_CLASS
-NM_IS_SETTING_WIMAX_CLASS
-NM_SETTING_WIMAX_GET_CLASS
+NM_IS_SETTING_GSM
+NM_IS_SETTING_GSM_CLASS
+NM_SETTING_GSM
+NM_SETTING_GSM_CLASS
+NM_SETTING_GSM_ERROR
+NM_SETTING_GSM_GET_CLASS
+NM_TYPE_SETTING_GSM
+NM_TYPE_SETTING_GSM_ERROR
+nm_setting_gsm_error_get_type
+nm_setting_gsm_get_type
 

 
 

 nm-setting-ip4-config
 NMSettingIP4Config
-NM_SETTING_IP4_CONFIG_SETTING_NAME
+NMIP4Address
+NMIP4Route
+NMSettingIP4Config
+NMSettingIP4ConfigClass
 NMSettingIP4ConfigError
-NM_TYPE_SETTING_IP4_CONFIG_ERROR
-NM_SETTING_IP4_CONFIG_ERROR
-nm_setting_ip4_config_error_quark
-NM_SETTING_IP4_CONFIG_METHOD
-NM_SETTING_IP4_CONFIG_DNS
-NM_SETTING_IP4_CONFIG_DNS_SEARCH
 NM_SETTING_IP4_CONFIG_ADDRESSES
-NM_SETTING_IP4_CONFIG_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
 NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
 NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+NM_SETTING_IP4_CONFIG_DNS
+NM_SETTING_IP4_CONFIG_DNS_SEARCH
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
 NM_SETTING_IP4_CONFIG_MAY_FAIL
+NM_SETTING_IP4_CONFIG_METHOD
 NM_SETTING_IP4_CONFIG_METHOD_AUTO
+NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 NM_SETTING_IP4_CONFIG_METHOD_SHARED
-NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-NMIP4Address
-nm_ip4_address_get_type
-nm_ip4_address_new
-nm_ip4_address_dup
-nm_ip4_address_ref
-nm_ip4_address_unref
+NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP4_CONFIG_ROUTES
+NM_SETTING_IP4_CONFIG_SETTING_NAME
 nm_ip4_address_compare
+nm_ip4_address_dup
 nm_ip4_address_get_address
-nm_ip4_address_set_address
-nm_ip4_address_get_prefix
-nm_ip4_address_set_prefix
 nm_ip4_address_get_gateway
+nm_ip4_address_get_prefix
+nm_ip4_address_new
+nm_ip4_address_ref
+nm_ip4_address_set_address
 nm_ip4_address_set_gateway
-NMIP4Route
-nm_ip4_route_get_type
-nm_ip4_route_new
-nm_ip4_route_dup
-nm_ip4_route_ref
-nm_ip4_route_unref
+nm_ip4_address_set_prefix
+nm_ip4_address_unref
 nm_ip4_route_compare
+nm_ip4_route_dup
 nm_ip4_route_get_dest
-nm_ip4_route_set_dest
-nm_ip4_route_get_prefix
-nm_ip4_route_set_prefix
-nm_ip4_route_get_next_hop
-nm_ip4_route_set_next_hop
 nm_ip4_route_get_metric
+nm_ip4_route_get_next_hop
+nm_ip4_route_get_prefix
+nm_ip4_route_new
+nm_ip4_route_ref
+nm_ip4_route_set_dest
 nm_ip4_route_set_metric
-NMSettingIP4Config
-NMSettingIP4ConfigClass
-nm_setting_ip4_config_get_type
-nm_setting_ip4_config_new
-nm_setting_ip4_config_get_method
-nm_setting_ip4_config_get_num_dns
-nm_setting_ip4_config_get_dns
+nm_ip4_route_set_next_hop
+nm_ip4_route_set_prefix
+nm_ip4_route_unref
+nm_setting_ip4_config_add_address
 nm_setting_ip4_config_add_dns
-nm_setting_ip4_config_remove_dns
-nm_setting_ip4_config_clear_dns
-nm_setting_ip4_config_get_num_dns_searches
-nm_setting_ip4_config_get_dns_search
 nm_setting_ip4_config_add_dns_search
-nm_setting_ip4_config_remove_dns_search
-nm_setting_ip4_config_clear_dns_searches
-nm_setting_ip4_config_get_num_addresses
-nm_setting_ip4_config_get_address
-nm_setting_ip4_config_add_address
-nm_setting_ip4_config_remove_address
-nm_setting_ip4_config_clear_addresses
-nm_setting_ip4_config_get_num_routes
-nm_setting_ip4_config_get_route
 nm_setting_ip4_config_add_route
-nm_setting_ip4_config_remove_route
+nm_setting_ip4_config_clear_addresses
+nm_setting_ip4_config_clear_dns
+nm_setting_ip4_config_clear_dns_searches
 nm_setting_ip4_config_clear_routes
-nm_setting_ip4_config_get_ignore_auto_routes
-nm_setting_ip4_config_get_ignore_auto_dns
+nm_setting_ip4_config_error_quark
+nm_setting_ip4_config_get_address
 nm_setting_ip4_config_get_dhcp_client_id
-nm_setting_ip4_config_get_dhcp_send_hostname
 nm_setting_ip4_config_get_dhcp_hostname
-nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_get_dhcp_send_hostname
+nm_setting_ip4_config_get_dns
+nm_setting_ip4_config_get_dns_search
+nm_setting_ip4_config_get_ignore_auto_dns
+nm_setting_ip4_config_get_ignore_auto_routes
 nm_setting_ip4_config_get_may_fail
+nm_setting_ip4_config_get_method
+nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_get_num_addresses
+nm_setting_ip4_config_get_num_dns
+nm_setting_ip4_config_get_num_dns_searches
+nm_setting_ip4_config_get_num_routes
+nm_setting_ip4_config_get_route
+nm_setting_ip4_config_new
+nm_setting_ip4_config_remove_address
+nm_setting_ip4_config_remove_dns
+nm_setting_ip4_config_remove_dns_search
+nm_setting_ip4_config_remove_route
 
-NM_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG
-NM_TYPE_SETTING_IP4_CONFIG
-nm_setting_ip4_config_error_get_type
-NM_SETTING_IP4_CONFIG_CLASS
 NM_IS_SETTING_IP4_CONFIG_CLASS
+NM_SETTING_IP4_CONFIG
+NM_SETTING_IP4_CONFIG_CLASS
+NM_SETTING_IP4_CONFIG_ERROR
 NM_SETTING_IP4_CONFIG_GET_CLASS
+NM_TYPE_SETTING_IP4_CONFIG
+NM_TYPE_SETTING_IP4_CONFIG_ERROR
+nm_ip4_address_get_type
+nm_ip4_route_get_type
+nm_setting_ip4_config_error_get_type
+nm_setting_ip4_config_get_type
 

 
 

-nm-setting-wired
-NMSettingWired
-NM_SETTING_WIRED_SETTING_NAME
-NMSettingWiredError
-NM_TYPE_SETTING_WIRED_ERROR
-NM_SETTING_WIRED_ERROR
-nm_setting_wired_error_quark
-NM_SETTING_WIRED_PORT
-NM_SETTING_WIRED_SPEED
-NM_SETTING_WIRED_DUPLEX
-NM_SETTING_WIRED_AUTO_NEGOTIATE
-NM_SETTING_WIRED_MAC_ADDRESS
-NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
-NM_SETTING_WIRED_MTU
-NM_SETTING_WIRED_S390_SUBCHANNELS
-NM_SETTING_WIRED_S390_NETTYPE
-NM_SETTING_WIRED_S390_OPTIONS
-NMSettingWired
-NMSettingWiredClass
-nm_setting_wired_get_type
-nm_setting_wired_new
-nm_setting_wired_get_port
-nm_setting_wired_get_speed
-nm_setting_wired_get_duplex
-nm_setting_wired_get_auto_negotiate
-nm_setting_wired_get_mac_address
-nm_setting_wired_get_cloned_mac_address
-nm_setting_wired_get_mac_address_blacklist
-nm_setting_wired_get_mtu
-nm_setting_wired_get_s390_subchannels
-nm_setting_wired_get_s390_nettype
-nm_setting_wired_get_num_s390_options
-nm_setting_wired_get_s390_option
-nm_setting_wired_get_s390_option_by_key
-nm_setting_wired_add_s390_option
-nm_setting_wired_remove_s390_option
-
-NM_SETTING_WIRED
-NM_IS_SETTING_WIRED
-NM_TYPE_SETTING_WIRED
-nm_setting_wired_error_get_type
-NM_SETTING_WIRED_CLASS
-NM_IS_SETTING_WIRED_CLASS
-NM_SETTING_WIRED_GET_CLASS
-

-
-

-nm-setting-connection
-NMSettingConnection
-NM_SETTING_CONNECTION_SETTING_NAME
-NMSettingConnectionError
-NM_TYPE_SETTING_CONNECTION_ERROR
-NM_SETTING_CONNECTION_ERROR
-nm_setting_connection_error_quark
-NM_SETTING_CONNECTION_ID
-NM_SETTING_CONNECTION_UUID
-NM_SETTING_CONNECTION_TYPE
-NM_SETTING_CONNECTION_AUTOCONNECT
-NM_SETTING_CONNECTION_TIMESTAMP
-NM_SETTING_CONNECTION_READ_ONLY
-NM_SETTING_CONNECTION_PERMISSIONS
-NMSettingConnection
-NMSettingConnectionClass
-nm_setting_connection_get_type
-nm_setting_connection_new
-nm_setting_connection_get_id
-nm_setting_connection_get_uuid
-nm_setting_connection_get_connection_type
-nm_setting_connection_get_autoconnect
-nm_setting_connection_get_timestamp
-nm_setting_connection_get_read_only
-nm_setting_connection_get_num_permissions
-nm_setting_connection_get_permission
-nm_setting_connection_permissions_user_allowed
-nm_setting_connection_add_permission
-nm_setting_connection_remove_permission
+nm-setting-ip6-config
+NMSettingIP6Config
+NMIP6Address
+NMIP6Route
+NMSettingIP6Config
+NMSettingIP6ConfigClass
+NMSettingIP6ConfigError
+NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_DNS
+NM_SETTING_IP6_CONFIG_DNS_SEARCH
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP6_CONFIG_MAY_FAIL
+NM_SETTING_IP6_CONFIG_METHOD
+NM_SETTING_IP6_CONFIG_METHOD_AUTO
+NM_SETTING_IP6_CONFIG_METHOD_DHCP
+NM_SETTING_IP6_CONFIG_METHOD_IGNORE
+NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
+NM_SETTING_IP6_CONFIG_METHOD_MANUAL
+NM_SETTING_IP6_CONFIG_METHOD_SHARED
+NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
+NM_SETTING_IP6_CONFIG_ROUTES
+NM_SETTING_IP6_CONFIG_SETTING_NAME
+nm_ip6_address_compare
+nm_ip6_address_dup
+nm_ip6_address_get_address
+nm_ip6_address_get_gateway
+nm_ip6_address_get_prefix
+nm_ip6_address_new
+nm_ip6_address_ref
+nm_ip6_address_set_address
+nm_ip6_address_set_gateway
+nm_ip6_address_set_prefix
+nm_ip6_address_unref
+nm_ip6_route_compare
+nm_ip6_route_dup
+nm_ip6_route_get_dest
+nm_ip6_route_get_metric
+nm_ip6_route_get_next_hop
+nm_ip6_route_get_prefix
+nm_ip6_route_new
+nm_ip6_route_ref
+nm_ip6_route_set_dest
+nm_ip6_route_set_metric
+nm_ip6_route_set_next_hop
+nm_ip6_route_set_prefix
+nm_ip6_route_unref
+nm_setting_ip6_config_add_address
+nm_setting_ip6_config_add_dns
+nm_setting_ip6_config_add_dns_search
+nm_setting_ip6_config_add_route
+nm_setting_ip6_config_clear_addresses
+nm_setting_ip6_config_clear_dns
+nm_setting_ip6_config_clear_dns_searches
+nm_setting_ip6_config_clear_routes
+nm_setting_ip6_config_error_quark
+nm_setting_ip6_config_get_address
+nm_setting_ip6_config_get_dns
+nm_setting_ip6_config_get_dns_search
+nm_setting_ip6_config_get_ignore_auto_dns
+nm_setting_ip6_config_get_ignore_auto_routes
+nm_setting_ip6_config_get_may_fail
+nm_setting_ip6_config_get_method
+nm_setting_ip6_config_get_never_default
+nm_setting_ip6_config_get_num_addresses
+nm_setting_ip6_config_get_num_dns
+nm_setting_ip6_config_get_num_dns_searches
+nm_setting_ip6_config_get_num_routes
+nm_setting_ip6_config_get_route
+nm_setting_ip6_config_new
+nm_setting_ip6_config_remove_address
+nm_setting_ip6_config_remove_dns
+nm_setting_ip6_config_remove_dns_search
+nm_setting_ip6_config_remove_route
 
-NM_SETTING_CONNECTION
-NM_IS_SETTING_CONNECTION
-NM_TYPE_SETTING_CONNECTION
-nm_setting_connection_error_get_type
-NM_SETTING_CONNECTION_CLASS
-NM_IS_SETTING_CONNECTION_CLASS
-NM_SETTING_CONNECTION_GET_CLASS
+NM_IS_SETTING_IP6_CONFIG
+NM_IS_SETTING_IP6_CONFIG_CLASS
+NM_SETTING_IP6_CONFIG
+NM_SETTING_IP6_CONFIG_CLASS
+NM_SETTING_IP6_CONFIG_ERROR
+NM_SETTING_IP6_CONFIG_GET_CLASS
+NM_TYPE_SETTING_IP6_CONFIG
+NM_TYPE_SETTING_IP6_CONFIG_ERROR
+nm_ip6_address_get_type
+nm_ip6_route_get_type
+nm_setting_ip6_config_error_get_type
+nm_setting_ip6_config_get_type
 

-
-

-nm-setting
-NMSetting
-NMSettingError
-NM_TYPE_SETTING_ERROR
-NM_SETTING_ERROR
-nm_setting_error_quark
-NM_SETTING_PARAM_SERIALIZE
-NM_SETTING_PARAM_REQUIRED
-NM_SETTING_PARAM_SECRET
-NM_SETTING_PARAM_FUZZY_IGNORE
-NM_SETTING_NAME
-NMSettingSecretFlags
-NMSettingCompareFlags
-NMSetting
-NMSettingClearSecretsWithFlagsFn
-NMSettingClass
-NMSettingValueIterFn
-nm_setting_get_type
-NMSettingHashFlags
-nm_setting_to_hash
-nm_setting_new_from_hash
-nm_setting_duplicate
-nm_setting_get_name
-nm_setting_verify
-nm_setting_compare
-NMSettingDiffResult
-nm_setting_diff
-nm_setting_enumerate_values
-nm_setting_to_string
-nm_setting_clear_secrets
-nm_setting_clear_secrets_with_flags
-nm_setting_need_secrets
-nm_setting_update_secrets
-nm_setting_get_secret_flags
-nm_setting_set_secret_flags
+
+

+nm-setting-olpc-mesh
+NMSettingOlpcMesh
+NMSettingOlpcMesh
+NMSettingOlpcMeshClass
+NMSettingOlpcMeshError
+NM_SETTING_OLPC_MESH_CHANNEL
+NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+NM_SETTING_OLPC_MESH_SETTING_NAME
+NM_SETTING_OLPC_MESH_SSID
+nm_setting_olpc_mesh_error_quark
+nm_setting_olpc_mesh_get_channel
+nm_setting_olpc_mesh_get_dhcp_anycast_address
+nm_setting_olpc_mesh_get_ssid
+nm_setting_olpc_mesh_new
 
-NM_SETTING
-NM_IS_SETTING
-NM_TYPE_SETTING
-nm_setting_error_get_type
-NM_SETTING_CLASS
-NM_IS_SETTING_CLASS
-NM_SETTING_GET_CLASS
+NM_IS_SETTING_OLPC_MESH
+NM_IS_SETTING_OLPC_MESH_CLASS
+NM_SETTING_OLPC_MESH
+NM_SETTING_OLPC_MESH_CLASS
+NM_SETTING_OLPC_MESH_ERROR
+NM_SETTING_OLPC_MESH_GET_CLASS
+NM_TYPE_SETTING_OLPC_MESH
+NM_TYPE_SETTING_OLPC_MESH_ERROR
+nm_setting_olpc_mesh_error_get_type
+nm_setting_olpc_mesh_get_type
 

 
 

 nm-setting-ppp
 NMSettingPPP
-NM_SETTING_PPP_SETTING_NAME
+NMSettingPPP
+NMSettingPPPClass
 NMSettingPPPError
-NM_TYPE_SETTING_PPP_ERROR
-NM_SETTING_PPP_ERROR
-nm_setting_ppp_error_quark
+NM_SETTING_PPP_BAUD
+NM_SETTING_PPP_CRTSCTS
+NM_SETTING_PPP_LCP_ECHO_FAILURE
+NM_SETTING_PPP_LCP_ECHO_INTERVAL
+NM_SETTING_PPP_MPPE_STATEFUL
+NM_SETTING_PPP_MRU
+NM_SETTING_PPP_MTU
 NM_SETTING_PPP_NOAUTH
-NM_SETTING_PPP_REFUSE_EAP
-NM_SETTING_PPP_REFUSE_PAP
-NM_SETTING_PPP_REFUSE_CHAP
-NM_SETTING_PPP_REFUSE_MSCHAP
-NM_SETTING_PPP_REFUSE_MSCHAPV2
 NM_SETTING_PPP_NOBSDCOMP
 NM_SETTING_PPP_NODEFLATE
 NM_SETTING_PPP_NO_VJ_COMP
+NM_SETTING_PPP_REFUSE_CHAP
+NM_SETTING_PPP_REFUSE_EAP
+NM_SETTING_PPP_REFUSE_MSCHAP
+NM_SETTING_PPP_REFUSE_MSCHAPV2
+NM_SETTING_PPP_REFUSE_PAP
 NM_SETTING_PPP_REQUIRE_MPPE
 NM_SETTING_PPP_REQUIRE_MPPE_128
-NM_SETTING_PPP_MPPE_STATEFUL
-NM_SETTING_PPP_CRTSCTS
-NM_SETTING_PPP_BAUD
-NM_SETTING_PPP_MRU
-NM_SETTING_PPP_MTU
-NM_SETTING_PPP_LCP_ECHO_FAILURE
-NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NMSettingPPP
-NMSettingPPPClass
-nm_setting_ppp_get_type
-nm_setting_ppp_new
+NM_SETTING_PPP_SETTING_NAME
+nm_setting_ppp_error_quark
+nm_setting_ppp_get_baud
+nm_setting_ppp_get_crtscts
+nm_setting_ppp_get_lcp_echo_failure
+nm_setting_ppp_get_lcp_echo_interval
+nm_setting_ppp_get_mppe_stateful
+nm_setting_ppp_get_mru
+nm_setting_ppp_get_mtu
+nm_setting_ppp_get_no_vj_comp
 nm_setting_ppp_get_noauth
-nm_setting_ppp_get_refuse_eap
-nm_setting_ppp_get_refuse_pap
+nm_setting_ppp_get_nobsdcomp
+nm_setting_ppp_get_nodeflate
 nm_setting_ppp_get_refuse_chap
+nm_setting_ppp_get_refuse_eap
 nm_setting_ppp_get_refuse_mschap
 nm_setting_ppp_get_refuse_mschapv2
-nm_setting_ppp_get_nobsdcomp
-nm_setting_ppp_get_nodeflate
-nm_setting_ppp_get_no_vj_comp
+nm_setting_ppp_get_refuse_pap
 nm_setting_ppp_get_require_mppe
 nm_setting_ppp_get_require_mppe_128
-nm_setting_ppp_get_mppe_stateful
-nm_setting_ppp_get_crtscts
-nm_setting_ppp_get_baud
-nm_setting_ppp_get_mru
-nm_setting_ppp_get_mtu
-nm_setting_ppp_get_lcp_echo_failure
-nm_setting_ppp_get_lcp_echo_interval
+nm_setting_ppp_new
 
-NM_SETTING_PPP
 NM_IS_SETTING_PPP
-NM_TYPE_SETTING_PPP
-nm_setting_ppp_error_get_type
-NM_SETTING_PPP_CLASS
 NM_IS_SETTING_PPP_CLASS
+NM_SETTING_PPP
+NM_SETTING_PPP_CLASS
+NM_SETTING_PPP_ERROR
 NM_SETTING_PPP_GET_CLASS
-

-
-

-nm-connection
-NMConnection
-NMConnectionError
-NM_TYPE_CONNECTION_ERROR
-NM_CONNECTION_ERROR
-nm_connection_error_quark
-NM_CONNECTION_PATH
-NMConnection
-NMConnectionClass
-nm_connection_get_type
-nm_connection_new
-nm_connection_new_from_hash
-nm_connection_duplicate
-nm_connection_create_setting
-nm_connection_add_setting
-nm_connection_remove_setting
-nm_connection_get_setting
-nm_connection_get_setting_by_name
-nm_connection_replace_settings
-nm_connection_compare
-nm_connection_diff
-nm_connection_verify
-nm_connection_need_secrets
-nm_connection_clear_secrets
-nm_connection_clear_secrets_with_flags
-nm_connection_update_secrets
-nm_connection_set_path
-nm_connection_get_path
-nm_connection_is_type
-nm_connection_for_each_setting_value
-nm_connection_to_hash
-nm_connection_dump
-nm_connection_lookup_setting_type
-nm_connection_lookup_setting_type_by_quark
-nm_connection_get_uuid
-nm_connection_get_id
-nm_connection_get_setting_802_1x
-nm_connection_get_setting_bluetooth
-nm_connection_get_setting_cdma
-nm_connection_get_setting_connection
-nm_connection_get_setting_gsm
-nm_connection_get_setting_ip4_config
-nm_connection_get_setting_ip6_config
-nm_connection_get_setting_olpc_mesh
-nm_connection_get_setting_ppp
-nm_connection_get_setting_pppoe
-nm_connection_get_setting_vpn
-nm_connection_get_setting_wimax
-nm_connection_get_setting_wired
-nm_connection_get_setting_wireless
-nm_connection_get_setting_wireless_security
-
-NM_CONNECTION
-NM_IS_CONNECTION
-NM_TYPE_CONNECTION
-nm_connection_error_get_type
-NM_CONNECTION_CLASS
-NM_IS_CONNECTION_CLASS
-NM_CONNECTION_GET_CLASS
+NM_TYPE_SETTING_PPP
+NM_TYPE_SETTING_PPP_ERROR
+nm_setting_ppp_error_get_type
+nm_setting_ppp_get_type
 

 
 

 nm-setting-pppoe
 NMSettingPPPOE
-NM_SETTING_PPPOE_SETTING_NAME
+NMSettingPPPOE
+NMSettingPPPOEClass
 NMSettingPPPOEError
-NM_TYPE_SETTING_PPPOE_ERROR
-NM_SETTING_PPPOE_ERROR
-nm_setting_pppoe_error_quark
-NM_SETTING_PPPOE_SERVICE
-NM_SETTING_PPPOE_USERNAME
 NM_SETTING_PPPOE_PASSWORD
 NM_SETTING_PPPOE_PASSWORD_FLAGS
-NMSettingPPPOE
-NMSettingPPPOEClass
-nm_setting_pppoe_get_type
-nm_setting_pppoe_new
-nm_setting_pppoe_get_service
-nm_setting_pppoe_get_username
+NM_SETTING_PPPOE_SERVICE
+NM_SETTING_PPPOE_SETTING_NAME
+NM_SETTING_PPPOE_USERNAME
+nm_setting_pppoe_error_quark
 nm_setting_pppoe_get_password
 nm_setting_pppoe_get_password_flags
+nm_setting_pppoe_get_service
+nm_setting_pppoe_get_username
+nm_setting_pppoe_new
 
-NM_SETTING_PPPOE
 NM_IS_SETTING_PPPOE
-NM_TYPE_SETTING_PPPOE
-nm_setting_pppoe_error_get_type
-NM_SETTING_PPPOE_CLASS
 NM_IS_SETTING_PPPOE_CLASS
+NM_SETTING_PPPOE
+NM_SETTING_PPPOE_CLASS
+NM_SETTING_PPPOE_ERROR
 NM_SETTING_PPPOE_GET_CLASS
+NM_TYPE_SETTING_PPPOE
+NM_TYPE_SETTING_PPPOE_ERROR
+nm_setting_pppoe_error_get_type
+nm_setting_pppoe_get_type
+

+
+

+nm-setting-private
+NM_SETTING_SECRET_FLAGS_ALL
+

+
+

+nm-setting-serial
+NMSettingSerial
+NMSettingSerial
+NMSettingSerialClass
+NMSettingSerialError
+NM_SETTING_SERIAL_BAUD
+NM_SETTING_SERIAL_BITS
+NM_SETTING_SERIAL_PARITY
+NM_SETTING_SERIAL_SEND_DELAY
+NM_SETTING_SERIAL_SETTING_NAME
+NM_SETTING_SERIAL_STOPBITS
+nm_setting_serial_error_quark
+nm_setting_serial_get_baud
+nm_setting_serial_get_bits
+nm_setting_serial_get_parity
+nm_setting_serial_get_send_delay
+nm_setting_serial_get_stopbits
+nm_setting_serial_new
+
+NM_IS_SETTING_SERIAL
+NM_IS_SETTING_SERIAL_CLASS
+NM_SETTING_SERIAL
+NM_SETTING_SERIAL_CLASS
+NM_SETTING_SERIAL_ERROR
+NM_SETTING_SERIAL_GET_CLASS
+NM_TYPE_SETTING_SERIAL
+NM_TYPE_SETTING_SERIAL_ERROR
+nm_setting_serial_error_get_type
+nm_setting_serial_get_type
 

 
 

 nm-setting-vpn
 NMSettingVPN
-NM_SETTING_VPN_SETTING_NAME
-NMSettingVpnError
-NM_TYPE_SETTING_VPN_ERROR
-NM_SETTING_VPN_ERROR
-nm_setting_vpn_error_quark
-NM_SETTING_VPN_SERVICE_TYPE
-NM_SETTING_VPN_USER_NAME
-NM_SETTING_VPN_DATA
-NM_SETTING_VPN_SECRETS
 NMSettingVPN
 NMSettingVPNClass
+NMSettingVpnError
 NMVPNIterFunc
-nm_setting_vpn_get_type
-nm_setting_vpn_new
+NM_SETTING_VPN_DATA
+NM_SETTING_VPN_SECRETS
+NM_SETTING_VPN_SERVICE_TYPE
+NM_SETTING_VPN_SETTING_NAME
+NM_SETTING_VPN_USER_NAME
+nm_setting_vpn_add_data_item
+nm_setting_vpn_add_secret
+nm_setting_vpn_error_quark
+nm_setting_vpn_foreach_data_item
+nm_setting_vpn_foreach_secret
+nm_setting_vpn_get_data_item
+nm_setting_vpn_get_secret
 nm_setting_vpn_get_service_type
 nm_setting_vpn_get_user_name
-nm_setting_vpn_add_data_item
-nm_setting_vpn_get_data_item
+nm_setting_vpn_new
 nm_setting_vpn_remove_data_item
-nm_setting_vpn_foreach_data_item
-nm_setting_vpn_add_secret
-nm_setting_vpn_get_secret
 nm_setting_vpn_remove_secret
-nm_setting_vpn_foreach_secret
 
-NM_SETTING_VPN
 NM_IS_SETTING_VPN
-NM_TYPE_SETTING_VPN
-nm_setting_vpn_error_get_type
-NM_SETTING_VPN_CLASS
 NM_IS_SETTING_VPN_CLASS
+NM_SETTING_VPN
+NM_SETTING_VPN_CLASS
+NM_SETTING_VPN_ERROR
 NM_SETTING_VPN_GET_CLASS
+NM_TYPE_SETTING_VPN
+NM_TYPE_SETTING_VPN_ERROR
+nm_setting_vpn_error_get_type
+nm_setting_vpn_get_type
+

+
+

+nm-setting-wimax
+NMSettingWimax
+NMSettingWimax
+NMSettingWimaxClass
+NMSettingWimaxError
+NM_SETTING_WIMAX_MAC_ADDRESS
+NM_SETTING_WIMAX_NETWORK_NAME
+NM_SETTING_WIMAX_SETTING_NAME
+nm_setting_wimax_error_quark
+nm_setting_wimax_get_mac_address
+nm_setting_wimax_get_network_name
+nm_setting_wimax_new
+
+NM_IS_SETTING_WIMAX
+NM_IS_SETTING_WIMAX_CLASS
+NM_SETTING_WIMAX
+NM_SETTING_WIMAX_CLASS
+NM_SETTING_WIMAX_ERROR
+NM_SETTING_WIMAX_GET_CLASS
+NM_TYPE_SETTING_WIMAX
+NM_TYPE_SETTING_WIMAX_ERROR
+nm_setting_wimax_error_get_type
+nm_setting_wimax_get_type
+

+
+

+nm-setting-wired
+NMSettingWired
+NMSettingWired
+NMSettingWiredClass
+NMSettingWiredError
+NM_SETTING_WIRED_AUTO_NEGOTIATE
+NM_SETTING_WIRED_CLONED_MAC_ADDRESS
+NM_SETTING_WIRED_DUPLEX
+NM_SETTING_WIRED_MAC_ADDRESS
+NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
+NM_SETTING_WIRED_MTU
+NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_S390_NETTYPE
+NM_SETTING_WIRED_S390_OPTIONS
+NM_SETTING_WIRED_S390_SUBCHANNELS
+NM_SETTING_WIRED_SETTING_NAME
+NM_SETTING_WIRED_SPEED
+nm_setting_wired_add_s390_option
+nm_setting_wired_error_quark
+nm_setting_wired_get_auto_negotiate
+nm_setting_wired_get_cloned_mac_address
+nm_setting_wired_get_duplex
+nm_setting_wired_get_mac_address
+nm_setting_wired_get_mac_address_blacklist
+nm_setting_wired_get_mtu
+nm_setting_wired_get_num_s390_options
+nm_setting_wired_get_port
+nm_setting_wired_get_s390_nettype
+nm_setting_wired_get_s390_option
+nm_setting_wired_get_s390_option_by_key
+nm_setting_wired_get_s390_subchannels
+nm_setting_wired_get_speed
+nm_setting_wired_new
+nm_setting_wired_remove_s390_option
+
+NM_IS_SETTING_WIRED
+NM_IS_SETTING_WIRED_CLASS
+NM_SETTING_WIRED
+NM_SETTING_WIRED_CLASS
+NM_SETTING_WIRED_ERROR
+NM_SETTING_WIRED_GET_CLASS
+NM_TYPE_SETTING_WIRED
+NM_TYPE_SETTING_WIRED_ERROR
+nm_setting_wired_error_get_type
+nm_setting_wired_get_type
 

 
 

 nm-setting-wireless
 NMSettingWireless
-NM_SETTING_WIRELESS_SETTING_NAME
+NMSettingWireless
+NMSettingWirelessClass
 NMSettingWirelessError
-NM_TYPE_SETTING_WIRELESS_ERROR
-NM_SETTING_WIRELESS_ERROR
-nm_setting_wireless_error_quark
-NM_SETTING_WIRELESS_SSID
-NM_SETTING_WIRELESS_MODE
 NM_SETTING_WIRELESS_BAND
-NM_SETTING_WIRELESS_CHANNEL
 NM_SETTING_WIRELESS_BSSID
-NM_SETTING_WIRELESS_RATE
-NM_SETTING_WIRELESS_TX_POWER
-NM_SETTING_WIRELESS_MAC_ADDRESS
+NM_SETTING_WIRELESS_CHANNEL
 NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
+NM_SETTING_WIRELESS_MAC_ADDRESS
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-NM_SETTING_WIRELESS_MTU
-NM_SETTING_WIRELESS_SEEN_BSSIDS
-NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_MODE
 NM_SETTING_WIRELESS_MODE_ADHOC
 NM_SETTING_WIRELESS_MODE_INFRA
-NMSettingWireless
-NMSettingWirelessClass
-nm_setting_wireless_get_type
-nm_setting_wireless_new
-nm_setting_wireless_get_ssid
-nm_setting_wireless_get_mode
+NM_SETTING_WIRELESS_MTU
+NM_SETTING_WIRELESS_RATE
+NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_SEEN_BSSIDS
+NM_SETTING_WIRELESS_SETTING_NAME
+NM_SETTING_WIRELESS_SSID
+NM_SETTING_WIRELESS_TX_POWER
+nm_setting_wireless_add_seen_bssid
+nm_setting_wireless_ap_security_compatible
+nm_setting_wireless_error_quark
 nm_setting_wireless_get_band
-nm_setting_wireless_get_channel
 nm_setting_wireless_get_bssid
-nm_setting_wireless_get_rate
-nm_setting_wireless_get_tx_power
-nm_setting_wireless_get_mac_address
+nm_setting_wireless_get_channel
 nm_setting_wireless_get_cloned_mac_address
+nm_setting_wireless_get_mac_address
 nm_setting_wireless_get_mac_address_blacklist
+nm_setting_wireless_get_mode
 nm_setting_wireless_get_mtu
-nm_setting_wireless_get_security
-nm_setting_wireless_add_seen_bssid
 nm_setting_wireless_get_num_seen_bssids
+nm_setting_wireless_get_rate
+nm_setting_wireless_get_security
 nm_setting_wireless_get_seen_bssid
-nm_setting_wireless_ap_security_compatible
+nm_setting_wireless_get_ssid
+nm_setting_wireless_get_tx_power
+nm_setting_wireless_new
 
-NM_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS
-NM_TYPE_SETTING_WIRELESS
-nm_setting_wireless_error_get_type
-NM_SETTING_WIRELESS_CLASS
 NM_IS_SETTING_WIRELESS_CLASS
+NM_SETTING_WIRELESS
+NM_SETTING_WIRELESS_CLASS
+NM_SETTING_WIRELESS_ERROR
 NM_SETTING_WIRELESS_GET_CLASS
+NM_TYPE_SETTING_WIRELESS
+NM_TYPE_SETTING_WIRELESS_ERROR
+nm_setting_wireless_error_get_type
+nm_setting_wireless_get_type
+

+
+

+nm-setting-wireless-security
+NMSettingWirelessSecurity
+NMSettingWirelessSecurity
+NMSettingWirelessSecurityClass
+NMSettingWirelessSecurityError
+NMWepKeyType
+NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
+NM_SETTING_WIRELESS_SECURITY_GROUP
+NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
+NM_SETTING_WIRELESS_SECURITY_PAIRWISE
+NM_SETTING_WIRELESS_SECURITY_PROTO
+NM_SETTING_WIRELESS_SECURITY_PSK
+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
+NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
+NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
+NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
+nm_setting_wireless_security_add_group
+nm_setting_wireless_security_add_pairwise
+nm_setting_wireless_security_add_proto
+nm_setting_wireless_security_clear_groups
+nm_setting_wireless_security_clear_pairwise
+nm_setting_wireless_security_clear_protos
+nm_setting_wireless_security_error_quark
+nm_setting_wireless_security_get_auth_alg
+nm_setting_wireless_security_get_group
+nm_setting_wireless_security_get_key_mgmt
+nm_setting_wireless_security_get_leap_password
+nm_setting_wireless_security_get_leap_password_flags
+nm_setting_wireless_security_get_leap_username
+nm_setting_wireless_security_get_num_groups
+nm_setting_wireless_security_get_num_pairwise
+nm_setting_wireless_security_get_num_protos
+nm_setting_wireless_security_get_pairwise
+nm_setting_wireless_security_get_proto
+nm_setting_wireless_security_get_psk
+nm_setting_wireless_security_get_psk_flags
+nm_setting_wireless_security_get_wep_key
+nm_setting_wireless_security_get_wep_key_flags
+nm_setting_wireless_security_get_wep_key_type
+nm_setting_wireless_security_get_wep_tx_keyidx
+nm_setting_wireless_security_new
+nm_setting_wireless_security_remove_group
+nm_setting_wireless_security_remove_pairwise
+nm_setting_wireless_security_remove_proto
+nm_setting_wireless_security_set_wep_key
+
+NM_IS_SETTING_WIRELESS_SECURITY
+NM_IS_SETTING_WIRELESS_SECURITY_CLASS
+NM_SETTING_WIRELESS_SECURITY
+NM_SETTING_WIRELESS_SECURITY_CLASS
+NM_SETTING_WIRELESS_SECURITY_ERROR
+NM_SETTING_WIRELESS_SECURITY_GET_CLASS
+NM_TYPE_SETTING_WIRELESS_SECURITY
+NM_TYPE_SETTING_WIRELESS_SECURITY_ERROR
+nm_setting_wireless_security_error_get_type
+nm_setting_wireless_security_get_type
 

 
 

 nm-utils
-nm_utils_init
+NMUtilsSecurityType
 nm_utils_deinit
-nm_utils_is_empty_ssid
 nm_utils_escape_ssid
-nm_utils_same_ssid
-nm_utils_ssid_to_utf8
 nm_utils_gvalue_hash_dup
-nm_utils_slist_free
-NMUtilsSecurityType
-nm_utils_security_valid
+nm_utils_init
 nm_utils_ip4_addresses_from_gvalue
 nm_utils_ip4_addresses_to_gvalue
-nm_utils_ip4_routes_from_gvalue
-nm_utils_ip4_routes_to_gvalue
+nm_utils_ip4_get_default_prefix
 nm_utils_ip4_netmask_to_prefix
 nm_utils_ip4_prefix_to_netmask
-nm_utils_ip4_get_default_prefix
+nm_utils_ip4_routes_from_gvalue
+nm_utils_ip4_routes_to_gvalue
 nm_utils_ip6_addresses_from_gvalue
 nm_utils_ip6_addresses_to_gvalue
-nm_utils_ip6_routes_from_gvalue
-nm_utils_ip6_routes_to_gvalue
 nm_utils_ip6_dns_from_gvalue
 nm_utils_ip6_dns_to_gvalue
+nm_utils_ip6_routes_from_gvalue
+nm_utils_ip6_routes_to_gvalue
+nm_utils_is_empty_ssid
+nm_utils_rsa_key_encrypt
+nm_utils_same_ssid
+nm_utils_security_valid
+nm_utils_slist_free
+nm_utils_ssid_to_utf8
 nm_utils_uuid_generate
 nm_utils_uuid_generate_from_string
-nm_utils_rsa_key_encrypt
-nm_utils_wifi_freq_to_channel
 nm_utils_wifi_channel_to_freq
 nm_utils_wifi_find_next_channel
+nm_utils_wifi_freq_to_channel
 nm_utils_wifi_is_channel_valid
 

 
-

-nm-setting-private
-NM_SETTING_SECRET_FLAGS_ALL
-

-
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
new file mode 100644
index 00000000..af48d52a
--- /dev/null
+++ b/docs/libnm-util/libnm-util.types
@@ -0,0 +1,40 @@
+nm_connection_error_get_type
+nm_connection_get_type
+nm_ip4_address_get_type
+nm_ip4_route_get_type
+nm_ip6_address_get_type
+nm_ip6_route_get_type
+nm_setting_802_1x_error_get_type
+nm_setting_802_1x_get_type
+nm_setting_bluetooth_error_get_type
+nm_setting_bluetooth_get_type
+nm_setting_cdma_error_get_type
+nm_setting_cdma_get_type
+nm_setting_connection_error_get_type
+nm_setting_connection_get_type
+nm_setting_error_get_type
+nm_setting_get_type
+nm_setting_gsm_error_get_type
+nm_setting_gsm_get_type
+nm_setting_ip4_config_error_get_type
+nm_setting_ip4_config_get_type
+nm_setting_ip6_config_error_get_type
+nm_setting_ip6_config_get_type
+nm_setting_olpc_mesh_error_get_type
+nm_setting_olpc_mesh_get_type
+nm_setting_ppp_error_get_type
+nm_setting_ppp_get_type
+nm_setting_pppoe_error_get_type
+nm_setting_pppoe_get_type
+nm_setting_serial_error_get_type
+nm_setting_serial_get_type
+nm_setting_vpn_error_get_type
+nm_setting_vpn_get_type
+nm_setting_wimax_error_get_type
+nm_setting_wimax_get_type
+nm_setting_wired_error_get_type
+nm_setting_wired_get_type
+nm_setting_wireless_error_get_type
+nm_setting_wireless_get_type
+nm_setting_wireless_security_error_get_type
+nm_setting_wireless_security_get_type
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
new file mode 100644
index 00000000..ddbbcf74
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -0,0 +1,470 @@
+
+NMConnection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmconnection: the object which received the signal.
+
+
+
+
+
+
+@nmconnection: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@secrets_updated: 
+
+
+
+
+
+
+@NM_CONNECTION_ERROR_UNKNOWN: 
+@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
+@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
+@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+@connection: 
+@setting: 
+
+
+
+
+
+
+
+@connection: 
+
+
+
+
+
+
+
+@connection: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@flags: 
+@Returns: 
+
+
+
+
+
+
+
+@name: 
+@Returns: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@flags: 
+@out_settings: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@setting_type: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@name: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@type: 
+@Returns: 
+
+
+
+
+
+
+
+@name: 
+@Returns: 
+
+
+
+
+
+
+
+@error_quark: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@hints: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@hash: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@setting_type: 
+
+
+
+
+
+
+
+@connection: 
+@new_settings: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+
+
+
+
+
+
+
+@connection: 
+@flags: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@setting_name: 
+@secrets: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@error: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
new file mode 100644
index 00000000..50256d11
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -0,0 +1,1010 @@
+
+NMSetting8021x
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
+@NM_SETTING_802_1X_CK_FORMAT_X509: 
+@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
+@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
+
+
+
+
+
+
+@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
+@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
+@NM_SETTING_802_1X_CK_SCHEME_PATH: 
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_802_1X_ERROR_UNKNOWN: 
+@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@altsubject_match: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@eap: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@phase2_altsubject_match: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key_path: 
+@password: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key_path: 
+@password: 
+@scheme: 
+@out_format: 
+@error: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
new file mode 100644
index 00000000..ef059fad
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -0,0 +1,132 @@
+
+NMSettingBluetooth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
+@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
new file mode 100644
index 00000000..9a23158a
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -0,0 +1,160 @@
+
+NMSettingCdma
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_CDMA_ERROR_UNKNOWN: 
+@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
new file mode 100644
index 00000000..7bbce879
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -0,0 +1,267 @@
+
+NMSettingConnection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
+@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@ptype: 
+@pitem: 
+@detail: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+@out_ptype: 
+@out_pitem: 
+@out_detail: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@uname: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
new file mode 100644
index 00000000..7d572ddb
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -0,0 +1,339 @@
+
+NMSettingGsm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_GSM_ERROR_UNKNOWN: 
+@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
+
+
+
+
+
+
+@NM_SETTING_GSM_BAND_UNKNOWN: 
+@NM_SETTING_GSM_BAND_ANY: 
+@NM_SETTING_GSM_BAND_EGSM: 
+@NM_SETTING_GSM_BAND_DCS: 
+@NM_SETTING_GSM_BAND_PCS: 
+@NM_SETTING_GSM_BAND_G850: 
+@NM_SETTING_GSM_BAND_U2100: 
+@NM_SETTING_GSM_BAND_U1800: 
+@NM_SETTING_GSM_BAND_U17IV: 
+@NM_SETTING_GSM_BAND_U800: 
+@NM_SETTING_GSM_BAND_U850: 
+@NM_SETTING_GSM_BAND_U900: 
+@NM_SETTING_GSM_BAND_U17IX: 
+@NM_SETTING_GSM_BAND_U1900: 
+@NM_SETTING_GSM_BAND_U2600: 
+
+
+
+
+
+
+@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
+@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
+@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
new file mode 100644
index 00000000..9d710571
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -0,0 +1,737 @@
+
+NMSettingIP4Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
+@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@address: 
+@other: 
+@Returns: 
+
+
+
+
+
+
+
+@source: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+
+
+
+
+
+
+
+@address: 
+@addr: 
+
+
+
+
+
+
+
+@address: 
+@gateway: 
+
+
+
+
+
+
+
+@address: 
+@prefix: 
+
+
+
+
+
+
+
+@address: 
+
+
+
+
+
+
+
+@route: 
+@other: 
+@Returns: 
+
+
+
+
+
+
+
+@source: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+
+
+
+
+
+
+
+@route: 
+@dest: 
+
+
+
+
+
+
+
+@route: 
+@metric: 
+
+
+
+
+
+
+
+@route: 
+@next_hop: 
+
+
+
+
+
+
+
+@route: 
+@prefix: 
+
+
+
+
+
+
+
+@route: 
+
+
+
+
+
+
+
+@setting: 
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@dns: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@dns_search: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
new file mode 100644
index 00000000..959a0e28
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -0,0 +1,681 @@
+
+NMSettingIP6Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
+@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@address: 
+@other: 
+@Returns: 
+
+
+
+
+
+
+
+@source: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@address: 
+
+
+
+
+
+
+
+@address: 
+@addr: 
+
+
+
+
+
+
+
+@address: 
+@gateway: 
+
+
+
+
+
+
+
+@address: 
+@prefix: 
+
+
+
+
+
+
+
+@address: 
+
+
+
+
+
+
+
+@route: 
+@other: 
+@Returns: 
+
+
+
+
+
+
+
+@source: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@route: 
+
+
+
+
+
+
+
+@route: 
+@dest: 
+
+
+
+
+
+
+
+@route: 
+@metric: 
+
+
+
+
+
+
+
+@route: 
+@next_hop: 
+
+
+
+
+
+
+
+@route: 
+@prefix: 
+
+
+
+
+
+
+
+@route: 
+
+
+
+
+
+
+
+@setting: 
+@address: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@dns: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@dns_search: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@route: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
new file mode 100644
index 00000000..4db8508e
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -0,0 +1,138 @@
+
+NMSettingOlpcMesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
+@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
new file mode 100644
index 00000000..34647654
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -0,0 +1,454 @@
+
+NMSettingPPP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_PPP_ERROR_UNKNOWN: 
+@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
new file mode 100644
index 00000000..d5772a87
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -0,0 +1,160 @@
+
+NMSettingPPPOE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
+@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
new file mode 100644
index 00000000..b9740165
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -0,0 +1,31 @@
+
+nm-setting-private
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
new file mode 100644
index 00000000..6a43dc3f
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -0,0 +1,181 @@
+
+NMSettingSerial
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
+@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
new file mode 100644
index 00000000..e7b724f2
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -0,0 +1,229 @@
+
+NMSettingVPN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_VPN_ERROR_UNKNOWN: 
+@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+@key: 
+@value: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@item: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@secret: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@setting: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
new file mode 100644
index 00000000..733fe165
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -0,0 +1,113 @@
+
+NMSettingWimax
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+
+
+
+
+
+
+@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
+@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
new file mode 100644
index 00000000..c3872575
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -0,0 +1,349 @@
+
+NMSettingWired
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_WIRED_ERROR_UNKNOWN: 
+@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@item: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+@out_key: 
+@out_value: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@key: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
new file mode 100644
index 00000000..6fec769c
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -0,0 +1,541 @@
+
+NMSettingWirelessSecurity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
+
+
+
+
+
+
+@NM_WEP_KEY_TYPE_UNKNOWN: 
+@NM_WEP_KEY_TYPE_KEY: 
+@NM_WEP_KEY_TYPE_PASSPHRASE: 
+@NM_WEP_KEY_TYPE_LAST: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@group: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@pairwise: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@proto: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+
+
+
+
+
+
+
+@setting: 
+@idx: 
+@key: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
new file mode 100644
index 00000000..d3ce038f
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -0,0 +1,398 @@
+
+NMSettingWireless
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
+@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
+@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+@bssid: 
+@Returns: 
+
+
+
+
+
+
+
+@s_wireless: 
+@s_wireless_sec: 
+@ap_flags: 
+@ap_wpa: 
+@ap_rsn: 
+@ap_mode: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@i: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
new file mode 100644
index 00000000..912a47c6
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -0,0 +1,323 @@
+
+NMSetting
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@verify: 
+@need_secrets: 
+@update_one_secret: 
+@get_secret_flags: 
+@set_secret_flags: 
+@compare_property: 
+@clear_secrets_with_flags: 
+@_reserved1: 
+@_reserved2: 
+
+
+
+
+
+
+@setting: 
+@secret: 
+@flags: 
+@user_data: 
+@Returns: 
+
+
+
+
+
+
+
+@NM_SETTING_COMPARE_FLAG_EXACT: 
+@NM_SETTING_COMPARE_FLAG_FUZZY: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
+
+
+
+
+
+
+@NM_SETTING_DIFF_RESULT_UNKNOWN: 
+@NM_SETTING_DIFF_RESULT_IN_A: 
+@NM_SETTING_DIFF_RESULT_IN_B: 
+
+
+
+
+
+
+@NM_SETTING_ERROR_UNKNOWN: 
+@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
+@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
+@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
+
+
+
+
+
+
+@NM_SETTING_HASH_FLAG_ALL: 
+@NM_SETTING_HASH_FLAG_NO_SECRETS: 
+@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
+
+
+
+
+
+
+@NM_SETTING_SECRET_FLAG_NONE: 
+@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
+@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
+@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
+
+
+
+
+
+
+@setting: 
+@key: 
+@value: 
+@flags: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@setting: 
+
+
+
+
+
+
+
+@setting: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@flags: 
+@Returns: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@flags: 
+@invert_results: 
+@results: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@func: 
+@user_data: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@secret_name: 
+@out_flags: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting_type: 
+@hash: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@secret_name: 
+@flags: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@flags: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@secrets: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@setting: 
+@all_settings: 
+@error: 
+@Returns: 
+
+
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
new file mode 100644
index 00000000..0d77c832
--- /dev/null
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -0,0 +1,316 @@
+
+nm-utils
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@NMU_SEC_INVALID: 
+@NMU_SEC_NONE: 
+@NMU_SEC_STATIC_WEP: 
+@NMU_SEC_LEAP: 
+@NMU_SEC_DYNAMIC_WEP: 
+@NMU_SEC_WPA_PSK: 
+@NMU_SEC_WPA_ENTERPRISE: 
+@NMU_SEC_WPA2_PSK: 
+@NMU_SEC_WPA2_ENTERPRISE: 
+
+
+
+
+
+
+@void: 
+
+
+
+
+
+
+
+@ssid: 
+@len: 
+@Returns: 
+
+
+
+
+
+
+
+@hash: 
+@Returns: 
+
+
+
+
+
+
+
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@value: 
+
+
+
+
+
+
+
+@ip: 
+@Returns: 
+
+
+
+
+
+
+
+@netmask: 
+@Returns: 
+
+
+
+
+
+
+
+@prefix: 
+@Returns: 
+
+
+
+
+
+
+
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@value: 
+
+
+
+
+
+
+
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@value: 
+
+
+
+
+
+
+
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@value: 
+
+
+
+
+
+
+
+@value: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@value: 
+
+
+
+
+
+
+
+@ssid: 
+@len: 
+@Returns: 
+
+
+
+
+
+
+
+@data: 
+@in_password: 
+@out_password: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@ssid1: 
+@ssid2: 
+@ignore_trailing_null: 
+@Returns: 
+
+
+
+
+
+
+
+@type: 
+@wifi_caps: 
+@have_ap: 
+@adhoc: 
+@ap_flags: 
+@ap_wpa: 
+@ap_rsn: 
+@Returns: 
+
+
+
+
+
+
+
+@list: 
+@elem_destroy_fn: 
+
+
+
+
+
+
+
+@ssid: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@s: 
+@Returns: 
+
+
+
+
+
+
+
+@channel: 
+@band: 
+@Returns: 
+
+
+
+
+
+
+
+@channel: 
+@direction: 
+@band: 
+@Returns: 
+
+
+
+
+
+
+
+@freq: 
+@Returns: 
+
+
+
+
+
+
+
+@channel: 
+@band: 
+@Returns: 
+
+
-- 
cgit 1.3.0-6-gf8a5