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 --- Makefile.in | 2 + NEWS | 5 + callouts/Makefile.in | 2 + callouts/tests/Makefile.in | 2 + cli/Makefile.in | 2 + cli/src/Makefile.in | 2 + configure | 128 +- configure.ac | 4 +- data/Makefile.in | 2 + docs/Makefile.in | 2 + docs/api/Makefile.in | 129 +- docs/api/NetworkManager.types | 0 docs/api/html/NetworkManager.devhelp | 30 - docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 36 +- docs/api/html/ix01.html | 6 +- docs/api/html/license.html | 4 +- docs/api/html/ref-dbus.html | 4 +- docs/api/html/ref-migrating.html | 62 +- docs/api/html/ref-settings.html | 40 +- docs/api/html/secrets-flags.html | 4 +- docs/api/html/spec.html | 4 +- docs/api/spec.html | 4 +- docs/api/tmpl/NetworkManager-unused.sgml | 0 docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 126 +- docs/libnm-glib/html/NMAccessPoint.html | 278 ++-- docs/libnm-glib/html/NMActiveConnection.html | 184 +-- docs/libnm-glib/html/NMClient.html | 688 ++++---- docs/libnm-glib/html/NMDHCP4Config.html | 50 +- docs/libnm-glib/html/NMDHCP6Config.html | 50 +- docs/libnm-glib/html/NMDevice.html | 496 +++--- docs/libnm-glib/html/NMDeviceBt.html | 90 +- docs/libnm-glib/html/NMDeviceEthernet.html | 102 +- docs/libnm-glib/html/NMDeviceModem.html | 68 +- docs/libnm-glib/html/NMDeviceWifi.html | 204 ++- docs/libnm-glib/html/NMDeviceWimax.html | 216 +-- docs/libnm-glib/html/NMIP4Config.html | 88 +- docs/libnm-glib/html/NMIP6Config.html | 80 +- docs/libnm-glib/html/NMObject.html | 42 +- docs/libnm-glib/html/NMRemoteConnection.html | 90 +- docs/libnm-glib/html/NMRemoteSettings.html | 290 ++-- docs/libnm-glib/html/NMSecretAgent.html | 342 ++-- docs/libnm-glib/html/NMVPNConnection.html | 74 +- docs/libnm-glib/html/NMWimaxNsp.html | 168 +- docs/libnm-glib/html/annotation-glossary.html | 4 +- docs/libnm-glib/html/api-index-full.html | 166 +- docs/libnm-glib/html/ch02.html | 8 +- docs/libnm-glib/html/index.html | 8 +- docs/libnm-glib/html/index.sgml | 418 +++-- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 152 +- docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 393 ----- .../html/libnm-glib-NMVpnPluginUiWidget.html | 347 ++++ docs/libnm-glib/html/libnm-glib-nm-types.html | 126 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 84 +- docs/libnm-glib/html/libnm-glib.devhelp | 496 ------ docs/libnm-glib/html/libnm-glib.devhelp2 | 412 +++-- docs/libnm-glib/html/object-tree.html | 4 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/libnm-glib-sections.txt | 1067 ++++++------ docs/libnm-glib/libnm-glib.png | Bin 0 -> 82140 bytes docs/libnm-glib/libnm-glib.types | 39 + docs/libnm-glib/tmpl/libnm-glib-unused.sgml | 0 docs/libnm-glib/tmpl/libnm_glib.sgml | 24 + docs/libnm-glib/tmpl/nm-access-point.sgml | 283 ++++ docs/libnm-glib/tmpl/nm-active-connection.sgml | 195 +++ docs/libnm-glib/tmpl/nm-client.sgml | 482 ++++++ docs/libnm-glib/tmpl/nm-device-bt.sgml | 116 ++ docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 137 ++ docs/libnm-glib/tmpl/nm-device-modem.sgml | 85 + docs/libnm-glib/tmpl/nm-device-wifi.sgml | 216 +++ docs/libnm-glib/tmpl/nm-device-wimax.sgml | 231 +++ docs/libnm-glib/tmpl/nm-device.sgml | 441 +++++ docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 84 + docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 84 + docs/libnm-glib/tmpl/nm-ip4-config.sgml | 158 ++ docs/libnm-glib/tmpl/nm-ip6-config.sgml | 137 ++ docs/libnm-glib/tmpl/nm-object.sgml | 85 + docs/libnm-glib/tmpl/nm-remote-connection.sgml | 163 ++ docs/libnm-glib/tmpl/nm-remote-settings.sgml | 223 +++ docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml | 242 +++ docs/libnm-glib/tmpl/nm-secret-agent.sgml | 205 +++ docs/libnm-glib/tmpl/nm-types.sgml | 24 + docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 105 ++ .../tmpl/nm-vpn-plugin-ui-interface.sgml | 219 +++ docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 46 + docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 154 ++ docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 146 ++ 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 ++++ examples/C/Makefile.in | 2 + examples/C/glib/Makefile.in | 2 + examples/C/qt/Makefile.in | 2 + examples/Makefile.in | 2 + examples/python/Makefile.in | 2 + gtk-doc.make | 126 +- include/Makefile.in | 2 + include/nm-version.h | 2 +- initscript/Arch/Makefile.in | 2 + initscript/Debian/Makefile.in | 2 + initscript/Gentoo/Makefile.in | 2 + initscript/Makefile.in | 2 + initscript/Mandriva/Makefile.in | 2 + initscript/RedHat/Makefile.in | 2 + initscript/SUSE/Makefile.in | 2 + initscript/Slackware/Makefile.in | 2 + initscript/linexa/Makefile.in | 2 + initscript/paldo/Makefile.in | 2 + introspection/Makefile.in | 2 + libnm-glib/Makefile.in | 2 + libnm-glib/tests/Makefile.in | 2 + libnm-util/Makefile.in | 2 + libnm-util/tests/Makefile.in | 2 + libnm-util/tests/certs/Makefile.in | 2 + m4/gtk-doc.m4 | 6 + man/Makefile.in | 2 + marshallers/Makefile.in | 2 + po/fr.po | 1684 +++++++++++-------- po/it.po | 1729 ++++++++++++-------- policy/Makefile.in | 2 + policy/org.freedesktop.NetworkManager.policy | 46 +- src/Makefile.in | 2 + src/backends/Makefile.in | 2 + src/bluez-manager/Makefile.in | 2 + src/dhcp-manager/Makefile.in | 2 + src/dhcp-manager/nm-dhcp-client.c | 2 +- src/dhcp-manager/nm-dhcp-dhclient.c | 17 +- src/dhcp-manager/tests/Makefile.in | 2 + src/dns-manager/Makefile.in | 2 + src/dns-manager/nm-dns-manager.c | 21 +- src/dnsmasq-manager/Makefile.in | 2 + src/ip6-manager/Makefile.in | 2 + src/ip6-manager/nm-ip6-manager.c | 1 + src/logging/Makefile.in | 2 + src/main.c | 9 + src/modem-manager/Makefile.in | 2 + src/nm-device.c | 2 +- src/nm-policy-hostname.c | 45 +- src/nm-policy.c | 66 +- src/ppp-manager/Makefile.in | 2 + src/settings/Makefile.in | 2 + src/settings/plugins/Makefile.in | 2 + src/settings/plugins/ifcfg-rh/Makefile.in | 2 + src/settings/plugins/ifcfg-rh/tests/Makefile.in | 2 + .../ifcfg-rh/tests/network-scripts/Makefile.in | 2 + src/settings/plugins/ifcfg-suse/Makefile.in | 2 + src/settings/plugins/ifnet/Makefile.in | 2 + src/settings/plugins/ifnet/tests/Makefile.in | 2 + src/settings/plugins/ifupdown/Makefile.in | 2 + src/settings/plugins/ifupdown/tests/Makefile.in | 2 + src/settings/plugins/keyfile/Makefile.in | 2 + src/settings/plugins/keyfile/tests/Makefile.in | 2 + .../plugins/keyfile/tests/keyfiles/Makefile.in | 2 + src/settings/plugins/keyfile/writer.c | 2 +- src/settings/tests/Makefile.in | 2 + src/supplicant-manager/Makefile.in | 2 + src/supplicant-manager/tests/Makefile.in | 2 + src/tests/Makefile.in | 2 + src/vpn-manager/Makefile.in | 2 + src/wimax/Makefile.in | 2 + test/Makefile.in | 2 + tools/Makefile.in | 2 + 211 files changed, 24223 insertions(+), 14277 deletions(-) create mode 100644 docs/api/NetworkManager.types delete mode 100644 docs/api/html/NetworkManager.devhelp create mode 100644 docs/api/tmpl/NetworkManager-unused.sgml delete mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html create mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html delete mode 100644 docs/libnm-glib/html/libnm-glib.devhelp create mode 100644 docs/libnm-glib/libnm-glib.png create mode 100644 docs/libnm-glib/libnm-glib.types create mode 100644 docs/libnm-glib/tmpl/libnm-glib-unused.sgml create mode 100644 docs/libnm-glib/tmpl/libnm_glib.sgml create mode 100644 docs/libnm-glib/tmpl/nm-access-point.sgml create mode 100644 docs/libnm-glib/tmpl/nm-active-connection.sgml create mode 100644 docs/libnm-glib/tmpl/nm-client.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-bt.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-ethernet.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-modem.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-wifi.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device-wimax.sgml create mode 100644 docs/libnm-glib/tmpl/nm-device.sgml create mode 100644 docs/libnm-glib/tmpl/nm-dhcp4-config.sgml create mode 100644 docs/libnm-glib/tmpl/nm-dhcp6-config.sgml create mode 100644 docs/libnm-glib/tmpl/nm-ip4-config.sgml create mode 100644 docs/libnm-glib/tmpl/nm-ip6-config.sgml create mode 100644 docs/libnm-glib/tmpl/nm-object.sgml create mode 100644 docs/libnm-glib/tmpl/nm-remote-connection.sgml create mode 100644 docs/libnm-glib/tmpl/nm-remote-settings.sgml create mode 100644 docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml create mode 100644 docs/libnm-glib/tmpl/nm-secret-agent.sgml create mode 100644 docs/libnm-glib/tmpl/nm-types.sgml create mode 100644 docs/libnm-glib/tmpl/nm-vpn-connection.sgml create mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml create mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml create mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin.sgml create mode 100644 docs/libnm-glib/tmpl/nm-wimax-nsp.sgml 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 diff --git a/Makefile.in b/Makefile.in index 35557071..fd04cc7a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,6 +198,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@ diff --git a/NEWS b/NEWS index 63f39e01..31f24506 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,11 @@ Overview of changes since NetworkManager-0.9.0 * Fix handling of SSIDs in the keyfile plugin * Fix some GObject Introspection annotations in libnm-glib and libnm-util * Fix setting hostnames from DHCP +* Fixes for building with recent GLib versions +* Don't update routing and DNS until a device is managed +* Fix bug causing IPv6 RA-provided routes to be ignored +* Fix possible wrong handling of 'keyfile' connection certificates +* Correct Shared connection IP address range to be as documented ============================================== diff --git a/callouts/Makefile.in b/callouts/Makefile.in index a064732c..1cef470c 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -242,6 +242,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@ diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index b4b7807e..eac990b1 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -151,6 +151,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@ diff --git a/cli/Makefile.in b/cli/Makefile.in index b3b3fc5a..c3de35f3 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -155,6 +155,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@ diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index 11c1d50c..def0b286 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -152,6 +152,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@ diff --git a/configure b/configure index c6a844fd..7e31eb6e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.1.95. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.2.0. # # Report bugs to . # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.1.95' -PACKAGE_STRING='NetworkManager 0.9.1.95' +PACKAGE_VERSION='0.9.2.0' +PACKAGE_STRING='NetworkManager 0.9.2.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -628,6 +628,8 @@ GTK_DOC_BUILD_HTML_FALSE GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -995,7 +997,9 @@ POLKIT_LIBS NSS_CFLAGS NSS_LIBS GNUTLS_CFLAGS -GNUTLS_LIBS' +GNUTLS_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -1538,7 +1542,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 0.9.1.95 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1608,7 +1612,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.1.95:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.2.0:";; esac cat <<\_ACEOF @@ -1746,6 +1750,10 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for GNUTLS, overriding pkg-config GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1813,7 +1821,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.1.95 +NetworkManager configure 0.9.2.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2357,7 +2365,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 0.9.1.95, which was +It was created by NetworkManager $as_me 0.9.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3178,7 +3186,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.1.95' + VERSION='0.9.2.0' cat >>confdefs.h <<_ACEOF @@ -16305,8 +16313,8 @@ fi NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=1 -NM_VERSION=0.9.1.95 +NM_MICRO_VERSION=2 +NM_VERSION=0.9.2.0 @@ -22275,6 +22283,7 @@ fi + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -22432,6 +22441,99 @@ fi else as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -23190,7 +23292,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 0.9.1.95, which was +This file was extended by NetworkManager $as_me 0.9.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23256,7 +23358,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 0.9.1.95 +NetworkManager config.status 0.9.2.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 75b99781..1822f84f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) -m4_define([nm_micro_version], [1]) -m4_define([nm_nano_version], [95]) +m4_define([nm_micro_version], [2]) +m4_define([nm_nano_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) diff --git a/data/Makefile.in b/data/Makefile.in index 08280c96..73947bd7 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -140,6 +140,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@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 334c16cf..651d7609 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -155,6 +155,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@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 043ecf8a..cfb75153 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -159,6 +159,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@ @@ -371,10 +373,10 @@ AUTOMAKE_OPTIONS = 1.7 @WITH_DOCS_TRUE@ migrating-to-09.xml \ @WITH_DOCS_TRUE@ $(NULL) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@@WITH_DOCS_TRUE@GTKDOC_RUN = @GTK_DOC_USE_LIBTOOL_TRUE@@WITH_DOCS_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute @@ -395,11 +397,11 @@ AUTOMAKE_OPTIONS = 1.7 @WITH_DOCS_FALSE@ version.xml.in #################################### -@WITH_DOCS_TRUE@EXTRA_DIST = $(SETUP_FILES) $(GENERATED_FILES) \ -@WITH_DOCS_TRUE@ version.xml.in +@WITH_DOCS_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) \ +@WITH_DOCS_TRUE@ $(GENERATED_FILES) version.xml.in @WITH_DOCS_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ @WITH_DOCS_TRUE@ html-build.stamp pdf-build.stamp \ -@WITH_DOCS_TRUE@ setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp +@WITH_DOCS_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp @WITH_DOCS_TRUE@SCANOBJ_FILES = \ @WITH_DOCS_TRUE@ $(DOC_MODULE).args \ @@ -761,36 +763,43 @@ uninstall-am: uninstall-local @WITH_DOCS_TRUE@setup-build.stamp: @WITH_DOCS_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@WITH_DOCS_TRUE@ echo 'gtk-doc: Preparing build'; \ -@WITH_DOCS_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ -@WITH_DOCS_TRUE@ if test "x$$files" != "x" ; then \ -@WITH_DOCS_TRUE@ for file in $$files ; do \ -@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/$$file && \ -@WITH_DOCS_TRUE@ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \ -@WITH_DOCS_TRUE@ done \ -@WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/tmpl && \ -@WITH_DOCS_TRUE@ cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +@WITH_DOCS_TRUE@ echo ' DOC Preparing build'; \ +@WITH_DOCS_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +@WITH_DOCS_TRUE@ if test "x$$files" != "x" ; then \ +@WITH_DOCS_TRUE@ for file in $$files ; do \ +@WITH_DOCS_TRUE@ test -f $(abs_srcdir)/$$file && \ +@WITH_DOCS_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ +@WITH_DOCS_TRUE@ done; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ test -d $(abs_srcdir)/tmpl && \ +@WITH_DOCS_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +@WITH_DOCS_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ @WITH_DOCS_TRUE@ fi @WITH_DOCS_TRUE@ @touch setup-build.stamp -@WITH_DOCS_TRUE@setup.stamp: setup-build.stamp -@WITH_DOCS_TRUE@ @true - #### scan #### @WITH_DOCS_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Scanning header files' +@WITH_DOCS_TRUE@ @echo ' DOC Scanning header files' @WITH_DOCS_TRUE@ @_source_dir='' ; \ @WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @WITH_DOCS_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @WITH_DOCS_TRUE@ done ; \ @WITH_DOCS_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) @WITH_DOCS_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@WITH_DOCS_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \ +@WITH_DOCS_TRUE@ echo " DOC Introspecting gobjects"; \ +@WITH_DOCS_TRUE@ scanobj_options=""; \ +@WITH_DOCS_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ +@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ +@WITH_DOCS_TRUE@ scanobj_options="--verbose"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ +@WITH_DOCS_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ @WITH_DOCS_TRUE@ else \ @WITH_DOCS_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@WITH_DOCS_TRUE@ test -f $$i || touch $$i ; \ +@WITH_DOCS_TRUE@ test -f $$i || touch $$i ; \ @WITH_DOCS_TRUE@ done \ @WITH_DOCS_TRUE@ fi @WITH_DOCS_TRUE@ @touch scan-build.stamp @@ -800,8 +809,8 @@ uninstall-am: uninstall-local #### templates #### -@WITH_DOCS_TRUE@tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Rebuilding template files' +@WITH_DOCS_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +@WITH_DOCS_TRUE@ @echo ' DOC Rebuilding template files' @WITH_DOCS_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) @WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ @WITH_DOCS_TRUE@ if test -w $(abs_srcdir) ; then \ @@ -819,7 +828,7 @@ uninstall-am: uninstall-local #### xml #### @WITH_DOCS_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building XML' +@WITH_DOCS_TRUE@ @echo ' DOC Building XML' @WITH_DOCS_TRUE@ @-chmod -R u+w $(srcdir) @WITH_DOCS_TRUE@ @_source_dir='' ; \ @WITH_DOCS_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @@ -834,13 +843,19 @@ uninstall-am: uninstall-local #### html #### @WITH_DOCS_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building HTML' +@WITH_DOCS_TRUE@ @echo ' DOC Building HTML' @WITH_DOCS_TRUE@ @rm -rf html @WITH_DOCS_TRUE@ @mkdir html @WITH_DOCS_TRUE@ @mkhtml_options=""; \ +@WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ +@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ +@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ @WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ -@WITH_DOCS_TRUE@ mkhtml_options=--path="$(abs_srcdir)"; \ +@WITH_DOCS_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ @WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @WITH_DOCS_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ @@ -852,49 +867,55 @@ uninstall-am: uninstall-local @WITH_DOCS_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ @WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ done; -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Fixing cross-references' +@WITH_DOCS_TRUE@ @echo ' DOC Fixing cross-references' @WITH_DOCS_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @WITH_DOCS_TRUE@ @touch html-build.stamp #### pdf #### @WITH_DOCS_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@WITH_DOCS_TRUE@ @echo 'gtk-doc: Building PDF' -@WITH_DOCS_TRUE@ @rm -rf $(DOC_MODULE).pdf -@WITH_DOCS_TRUE@ @mkpdf_imgdirs=""; \ +@WITH_DOCS_TRUE@ @echo ' DOC Building PDF' +@WITH_DOCS_TRUE@ @rm -f $(DOC_MODULE).pdf +@WITH_DOCS_TRUE@ @mkpdf_options=""; \ +@WITH_DOCS_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +@WITH_DOCS_TRUE@ if test "$(?)" = "0"; then \ +@WITH_DOCS_TRUE@ if test "x$(V)" = "x1"; then \ +@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ +@WITH_DOCS_TRUE@ fi; \ +@WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ @WITH_DOCS_TRUE@ for img in $(HTML_IMAGES); do \ @WITH_DOCS_TRUE@ part=`dirname $$img`; \ -@WITH_DOCS_TRUE@ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ +@WITH_DOCS_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ @WITH_DOCS_TRUE@ if test $$? != 0; then \ -@WITH_DOCS_TRUE@ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ +@WITH_DOCS_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ @WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ done; \ @WITH_DOCS_TRUE@ fi; \ -@WITH_DOCS_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) +@WITH_DOCS_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @WITH_DOCS_TRUE@ @touch pdf-build.stamp ############## @WITH_DOCS_TRUE@clean-local: -@WITH_DOCS_TRUE@ rm -f *~ *.bak -@WITH_DOCS_TRUE@ rm -rf .libs +@WITH_DOCS_TRUE@ @rm -f *~ *.bak +@WITH_DOCS_TRUE@ @rm -rf .libs @WITH_DOCS_TRUE@distclean-local: -@WITH_DOCS_TRUE@ rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ +@WITH_DOCS_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @WITH_DOCS_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt -@WITH_DOCS_TRUE@ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@WITH_DOCS_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ @WITH_DOCS_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ @WITH_DOCS_TRUE@ rm -rf tmpl; \ @WITH_DOCS_TRUE@ fi @WITH_DOCS_TRUE@maintainer-clean-local: clean -@WITH_DOCS_TRUE@ rm -rf xml html +@WITH_DOCS_TRUE@ @rm -rf xml html @WITH_DOCS_TRUE@install-data-local: -@WITH_DOCS_TRUE@ @installfiles=`echo $(srcdir)/html/*`; \ -@WITH_DOCS_TRUE@ if test "$$installfiles" = '$(srcdir)/html/*'; \ -@WITH_DOCS_TRUE@ then echo '-- Nothing to install' ; \ +@WITH_DOCS_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ +@WITH_DOCS_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ +@WITH_DOCS_TRUE@ then echo 1>&2 'Nothing to install' ; \ @WITH_DOCS_TRUE@ else \ @WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ @WITH_DOCS_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -903,14 +924,12 @@ uninstall-am: uninstall-local @WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ $(mkinstalldirs) $${installdir} ; \ @WITH_DOCS_TRUE@ for i in $$installfiles; do \ -@WITH_DOCS_TRUE@ echo '-- Installing '$$i ; \ +@WITH_DOCS_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ @WITH_DOCS_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ @WITH_DOCS_TRUE@ done; \ @WITH_DOCS_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ @WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ @WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@WITH_DOCS_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ -@WITH_DOCS_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ @WITH_DOCS_TRUE@ fi; \ @WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ @WITH_DOCS_TRUE@ fi @@ -932,15 +951,15 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_FALSE@@WITH_DOCS_TRUE@ @false @WITH_DOCS_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@WITH_DOCS_TRUE@ mkdir $(distdir)/tmpl -@WITH_DOCS_TRUE@ mkdir $(distdir)/html -@WITH_DOCS_TRUE@ -cp $(build)/tmpl/*.sgml $(distdir)/tmpl -@WITH_DOCS_TRUE@ cp $(builddir)/html/* $(distdir)/html -@WITH_DOCS_TRUE@ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/ -@WITH_DOCS_TRUE@ -cp $(build)/$(DOC_MODULE).types $(distdir)/ -@WITH_DOCS_TRUE@ -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/ -@WITH_DOCS_TRUE@ cd $(distdir) && rm -f $(DISTCLEANFILES) -@WITH_DOCS_TRUE@ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html +@WITH_DOCS_TRUE@ @mkdir $(distdir)/tmpl +@WITH_DOCS_TRUE@ @mkdir $(distdir)/html +@WITH_DOCS_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl +@WITH_DOCS_TRUE@ @cp ./html/* $(distdir)/html +@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ +@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ +@WITH_DOCS_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ +@WITH_DOCS_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) +@WITH_DOCS_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html @WITH_DOCS_TRUE@.PHONY : dist-hook-local docs diff --git a/docs/api/NetworkManager.types b/docs/api/NetworkManager.types new file mode 100644 index 00000000..e69de29b diff --git a/docs/api/html/NetworkManager.devhelp b/docs/api/html/NetworkManager.devhelp deleted file mode 100644 index a6c6d17d..00000000 --- a/docs/api/html/NetworkManager.devhelp +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 2c08e0b1..b611186d 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 84aa84c9..d0f34722 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -6,7 +6,7 @@ - + @@ -22,11 +22,11 @@     
  

-

Version 0.9.1.95 +

Version 0.9.2.0

Copyright © 2011 The NetworkManager Authors

-

+

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

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

-Index

+Index
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index fc0b0a38..e23a9d15 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -7,7 +7,7 @@ - + @@ -380,6 +380,6 @@ Public License instead of this License.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html index 29392bed..9d3c0ef4 100644 --- a/docs/api/html/ref-dbus.html +++ b/docs/api/html/ref-dbus.html @@ -8,7 +8,7 @@ - + @@ -30,6 +30,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 5e5471b1..abc58248 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -8,7 +8,7 @@ - + @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

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

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

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

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

-Elimination of the User Settings Service

+Elimination of the User Settings Service

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

-User Secret Agents

+User Secret Agents

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

-Settings Service Interface Changes

+Settings Service Interface Changes

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

-Connection Object Interface Changes

+Connection Object Interface Changes

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

-Permissions Methods Consolidation

+Permissions Methods Consolidation

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

-

Table 17. 

+

Table 17. 

@@ -305,7 +305,7 @@

-AddConnection Returns Object Path of New Connection

+AddConnection Returns Object Path of New Connection

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

-Support for WiMAX Devices

+Support for WiMAX Devices

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

-New Device States

+New Device States

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

-New Active Connection State

+New Active Connection State

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

-Consolidated Modem Devices

+Consolidated Modem Devices

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

-Secret Property Flags

+Secret Property Flags

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

-

Table 18. 

+

Table 18. 

@@ -484,7 +484,7 @@

-Deprecated Methods Removed

+Deprecated Methods Removed

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

-

Table 19. 

+

Table 19. 

@@ -534,6 +534,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 59994af9..b1737585 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -8,7 +8,7 @@ - + @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

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

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -228,7 +228,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -267,7 +267,7 @@


-

Table 3. cdma setting

+

Table 3. cdma setting

@@ -318,7 +318,7 @@


-

Table 4. connection setting

+

Table 4. connection setting

@@ -387,7 +387,7 @@


-

Table 5. gsm setting

+

Table 5. gsm setting

@@ -480,7 +480,7 @@


-

Table 6. ipv4 setting

+

Table 6. ipv4 setting

@@ -579,7 +579,7 @@


-

Table 7. ipv6 setting

+

Table 7. ipv6 setting

@@ -660,7 +660,7 @@


-

Table 8. 802-11-olpc-mesh setting

+

Table 8. 802-11-olpc-mesh setting

@@ -705,7 +705,7 @@


-

Table 9. ppp setting

+

Table 9. ppp setting

@@ -840,7 +840,7 @@


-

Table 10. pppoe setting

+

Table 10. pppoe setting

@@ -891,7 +891,7 @@


-

Table 11. serial setting

+

Table 11. serial setting

@@ -948,7 +948,7 @@


-

Table 12. vpn setting

+

Table 12. vpn setting

@@ -999,7 +999,7 @@


-

Table 13. wimax setting

+

Table 13. wimax setting

@@ -1038,7 +1038,7 @@


-

Table 14. 802-3-ethernet setting

+

Table 14. 802-3-ethernet setting

@@ -1131,7 +1131,7 @@


-

Table 15. 802-11-wireless setting

+

Table 15. 802-11-wireless setting

@@ -1236,7 +1236,7 @@


-

Table 16. 802-11-wireless-security setting

+

Table 16. 802-11-wireless-security setting

@@ -1368,6 +1368,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html index ee0a78fe..23f90ec7 100644 --- a/docs/api/html/secrets-flags.html +++ b/docs/api/html/secrets-flags.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 3d38d7e3..eb0a828b 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.1.95

NetworkManager D-Bus Interface Specification

Version 0.9.1.95

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

NetworkManager D-Bus Interface Specification

Version 0.9.2.0

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

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/spec.html b/docs/api/spec.html index 3d38d7e3..eb0a828b 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,5 +1,5 @@ -NetworkManager D-Bus Interface Specification version 0.9.1.95

NetworkManager D-Bus Interface Specification

Version 0.9.1.95

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

NetworkManager D-Bus Interface Specification

Version 0.9.2.0

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

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/tmpl/NetworkManager-unused.sgml b/docs/api/tmpl/NetworkManager-unused.sgml new file mode 100644 index 00000000..e69de29b diff --git a/docs/api/version.xml b/docs/api/version.xml index dbd0ed64..594150e3 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.9.1.95 +0.9.2.0 diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 7ebf62ad..f8c948f3 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/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@ @@ -365,10 +367,10 @@ GTKDOC_LIBS = \ $(top_builddir)/libnm-glib/libnm-glib.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 @@ -386,11 +388,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 \ @@ -616,36 +619,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 @@ -655,8 +665,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 \ @@ -674,7 +684,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 \ @@ -689,13 +699,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" || \ @@ -707,49 +723,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)"; \ @@ -758,14 +780,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 @@ -787,15 +807,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-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 6124f9bb..57efc51f 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -8,7 +8,7 @@ - + @@ -41,35 +41,34 @@

Synopsis

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

Details

-

NM_ACCESS_POINT_FLAGS

-
#define NM_ACCESS_POINT_FLAGS       "flags"
+
NMAccessPoint

+
typedef struct _NMAccessPoint NMAccessPoint;

+

+

+
+
+
+

NMAccessPointClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMAccessPointClass;

-

NM_ACCESS_POINT_WPA_FLAGS

-
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
+
NM_ACCESS_POINT_BSSID

+
#define NM_ACCESS_POINT_BSSID       "bssid"
-

NM_ACCESS_POINT_RSN_FLAGS

-
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
+
NM_ACCESS_POINT_FLAGS

+
#define NM_ACCESS_POINT_FLAGS       "flags"
-

NM_ACCESS_POINT_SSID

-
#define NM_ACCESS_POINT_SSID        "ssid"
+
NM_ACCESS_POINT_FREQUENCY

+
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
-

NM_ACCESS_POINT_BSSID

-
#define NM_ACCESS_POINT_BSSID       "bssid"
+
NM_ACCESS_POINT_HW_ADDRESS

+
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
-

NM_ACCESS_POINT_FREQUENCY

-
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
+
NM_ACCESS_POINT_MAX_BITRATE

+
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

 

 

@@ -159,76 +175,75 @@ const char *            
-
NM_ACCESS_POINT_MAX_BITRATE

-
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
+
NM_ACCESS_POINT_RSN_FLAGS

+
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
-

NM_ACCESS_POINT_STRENGTH

-
#define NM_ACCESS_POINT_STRENGTH    "strength"
+
NM_ACCESS_POINT_SSID

+
#define NM_ACCESS_POINT_SSID        "ssid"
-

NM_ACCESS_POINT_HW_ADDRESS

-
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+
NM_ACCESS_POINT_STRENGTH

+
#define NM_ACCESS_POINT_STRENGTH    "strength"
-

NMAccessPoint

-
typedef struct _NMAccessPoint NMAccessPoint;
+

NM_ACCESS_POINT_WPA_FLAGS

+
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
+

-

NMAccessPointClass

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

nm_access_point_connection_valid ()

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

-

nm_access_point_new ()

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

nm_access_point_filter_connections ()

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

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

- - + + - - + + - @@ -236,10 +251,10 @@ Creates a new
-

nm_access_point_get_flags ()

-
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
+

nm_access_point_get_bssid ()

+
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);

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

connection :

the DBusGConnection -

ap :

an NMAccessPoint to filter connections for

path :

the DBusobject path of the access point

connections :

a list of +NMConnection objects to filter. [element-type NetworkManager.Connection] +

Returns :

a new access point. [transfer full] +a +list of NMConnection objects that could be activated with the given ap. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
@@ -251,17 +266,18 @@ Gets the flags of the access point. - +

Returns :

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

nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags  nm_access_point_get_wpa_flags   (NMAccessPoint *ap);
+

nm_access_point_get_flags ()

+
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

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

@@ -273,18 +289,17 @@ Gets the WPA (version 1) flags of the access point. - +

Returns :

the WPA flagsthe flags
-

nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags  nm_access_point_get_rsn_flags   (NMAccessPoint *ap);
+

nm_access_point_get_frequency ()

+
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

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

@@ -296,17 +311,21 @@ point. - +

Returns :

the RSN flagsthe frequency
-

nm_access_point_get_ssid ()

-
const GByteArray *      nm_access_point_get_ssid        (NMAccessPoint *ap);
+

nm_access_point_get_hw_address ()

+
const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);
+
+

Warning

+

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

+

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

@@ -318,18 +337,18 @@ Gets the SSID of the access point. - +

Returns :

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

nm_access_point_get_bssid ()

-
const char *            nm_access_point_get_bssid       (NMAccessPoint *ap);
+

nm_access_point_get_max_bitrate ()

+
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

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

@@ -341,18 +360,17 @@ Gets the Basic Service Set ID (BSSID) of the WiFi access point. - +

Returns :

the BSSID of the access point. This is an internal string and must -not be modified or freed.the maximum bit rate
-

nm_access_point_get_frequency ()

-
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);
+

nm_access_point_get_mode ()

+
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);

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

@@ -364,17 +382,18 @@ Gets the frequency of the access point. - +

Returns :

the frequencythe mode
-

nm_access_point_get_mode ()

-
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);
+

nm_access_point_get_rsn_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

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

@@ -386,17 +405,17 @@ Gets the mode of the access point. - +

Returns :

the modethe RSN flags
-

nm_access_point_get_max_bitrate ()

-
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);
+

nm_access_point_get_ssid ()

+
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

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

@@ -408,7 +427,8 @@ Gets the maximum bit rate of the access point. - +

Returns :

the maximum bit ratethe GByteArray containing the SSID. This is the internal copy used by the +access point, and must not be modified.
@@ -437,72 +457,50 @@ Gets the current signal strength of the access point.
-

nm_access_point_filter_connections ()

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

nm_access_point_get_wpa_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

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

- - - - - - +

ap :

an NMAccessPoint to filter connections for

connections :

a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] +a NMAccessPoint

Returns :

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

nm_access_point_connection_valid ()

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

-

-
-
-
-

nm_access_point_get_hw_address ()

-
const char *            nm_access_point_get_hw_address  (NMAccessPoint *ap);
-
-

Warning

-

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

-
+

nm_access_point_new ()

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

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

- - + + + + + - +

ap :

a NMAccessPoint +

connection :

the DBusGConnection

path :

the DBusobject path of the access point

Returns :

the hardware address of the access point. This is the internal string used by the -access point and must not be modified.a new access point. [transfer full] +
@@ -605,6 +603,6 @@ The WPA flags of the access point.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index f8548683..15d628d7 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -8,7 +8,7 @@ - + @@ -41,25 +41,25 @@

Synopsis

-
#define             NM_ACTIVE_CONNECTION_CONNECTION
-#define             NM_ACTIVE_CONNECTION_UUID
-#define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-#define             NM_ACTIVE_CONNECTION_DEVICES
-#define             NM_ACTIVE_CONNECTION_STATE
+
                    NMActiveConnection;
+                    NMActiveConnectionClass;
+#define             NM_ACTIVE_CONNECTION_CONNECTION
 #define             NM_ACTIVE_CONNECTION_DEFAULT
 #define             NM_ACTIVE_CONNECTION_DEFAULT6
-                    NMActiveConnection;
-                    NMActiveConnectionClass;
-GObject *           nm_active_connection_new            (DBusGConnection *connection,
-                                                         const char *path);
+#define             NM_ACTIVE_CONNECTION_DEVICES
+#define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
+#define             NM_ACTIVE_CONNECTION_STATE
+#define             NM_ACTIVE_CONNECTION_UUID
 const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
-const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
-const char *        nm_active_connection_get_specific_object
-                                                        (NMActiveConnection *connection);
-const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
-NMActiveConnectionState  nm_active_connection_get_state (NMActiveConnection *connection);
 gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
 gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
+const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
+const char *        nm_active_connection_get_specific_object
+                                                        (NMActiveConnection *connection);
+NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
+const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
+GObject *           nm_active_connection_new            (DBusGConnection *connection,
+                                                         const char *path);
@@ -90,119 +90,115 @@ const

Details

-

NM_ACTIVE_CONNECTION_CONNECTION

-
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
-
+

NMActiveConnection

+
typedef struct _NMActiveConnection NMActiveConnection;

-

NM_ACTIVE_CONNECTION_UUID

-
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
+
NMActiveConnectionClass

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

NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

-
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
+
NM_ACTIVE_CONNECTION_CONNECTION

+
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
-

NM_ACTIVE_CONNECTION_DEVICES

-
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
+
NM_ACTIVE_CONNECTION_DEFAULT

+
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
-

NM_ACTIVE_CONNECTION_STATE

-
#define NM_ACTIVE_CONNECTION_STATE               "state"
+
NM_ACTIVE_CONNECTION_DEFAULT6

+
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
-

NM_ACTIVE_CONNECTION_DEFAULT

-
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
+
NM_ACTIVE_CONNECTION_DEVICES

+
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
-

NM_ACTIVE_CONNECTION_DEFAULT6

-
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
+
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

+
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
-

NMActiveConnection

-
typedef struct _NMActiveConnection NMActiveConnection;
+

NM_ACTIVE_CONNECTION_STATE

+
#define NM_ACTIVE_CONNECTION_STATE               "state"
+

-

NMActiveConnectionClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMActiveConnectionClass;
+
NM_ACTIVE_CONNECTION_UUID

+
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
-

nm_active_connection_new ()

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

nm_active_connection_get_connection ()

+
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

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

- - - - - - +

connection :

the DBusGConnection +a NMActiveConnection

path :

the DBus object path of the device

Returns :

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

nm_active_connection_get_connection ()

-
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
+

nm_active_connection_get_default ()

+
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

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

@@ -214,18 +210,19 @@ Gets the Returns :

- +
the object path of the NMConnection inside of NMActiveConnection. -This is the internal string used by the connection, and must not be modified. +TRUE if the active connection is the default IPv4 connection
-

nm_active_connection_get_uuid ()

-
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
+

nm_active_connection_get_default6 ()

+
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

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

@@ -237,19 +234,18 @@ Gets the Returns :

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

nm_active_connection_get_specific_object ()

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

nm_active_connection_get_devices ()

+
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

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

@@ -261,18 +257,20 @@ Gets the "specific object" used at the activation. - +

Returns :

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

nm_active_connection_get_devices ()

-
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
+

nm_active_connection_get_specific_object ()

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

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

@@ -284,9 +282,8 @@ Gets the Returns :

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

nm_active_connection_get_state ()

-
NMActiveConnectionState  nm_active_connection_get_state (NMActiveConnection *connection);
+
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

Gets the active connection's state.

@@ -315,11 +312,10 @@ Gets the active connection's state.
-

nm_active_connection_get_default ()

-
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
+

nm_active_connection_get_uuid ()

+
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

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

@@ -331,32 +327,36 @@ the default IPv4 route and DNS information). - +

Returns :

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

nm_active_connection_get_default6 ()

-
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
+

nm_active_connection_new ()

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

-Whether the active connection is the default IPv6 one (that is, is used for -the default IPv6 route and DNS information). +Creates a new NMActiveConnection.

- + + + + - +

connection :

a NMActiveConnection +the DBusGConnection

path :

the DBus object path of the device

Returns :

 -TRUE if the active connection is the default IPv6 connectiona new active connection. [transfer full] +
@@ -419,6 +419,6 @@ The state of the active connection.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 48fe024f..81015347 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -8,7 +8,7 @@ - + @@ -43,42 +43,36 @@

Synopsis

-
#define             NM_CLIENT_VERSION
-#define             NM_CLIENT_STATE
+
                    NMClient;
+void                (*NMClientActivateFn)               (NMClient *client,
+                                                         NMActiveConnection *active_connection,
+                                                         GError *error,
+                                                         gpointer user_data);
+void                (*NMClientAddActivateFn)            (NMClient *client,
+                                                         NMActiveConnection *connection,
+                                                         const char *new_connection_path,
+                                                         GError *error,
+                                                         gpointer user_data);
+                    NMClientClass;
+enum                NMClientPermission;
+enum                NMClientPermissionResult;
+#define             NM_CLIENT_ACTIVE_CONNECTIONS
 #define             NM_CLIENT_MANAGER_RUNNING
 #define             NM_CLIENT_NETWORKING_ENABLED
+#define             NM_CLIENT_STATE
+#define             NM_CLIENT_VERSION
+#define             NM_CLIENT_WIMAX_ENABLED
+#define             NM_CLIENT_WIMAX_HARDWARE_ENABLED
 #define             NM_CLIENT_WIRELESS_ENABLED
 #define             NM_CLIENT_WIRELESS_HARDWARE_ENABLED
 #define             NM_CLIENT_WWAN_ENABLED
 #define             NM_CLIENT_WWAN_HARDWARE_ENABLED
-#define             NM_CLIENT_WIMAX_ENABLED
-#define             NM_CLIENT_WIMAX_HARDWARE_ENABLED
-#define             NM_CLIENT_ACTIVE_CONNECTIONS
-enum                NMClientPermission;
-enum                NMClientPermissionResult;
-                    NMClient;
-                    NMClientClass;
-NMClient *          nm_client_new                       (void);
-const GPtrArray *   nm_client_get_devices               (NMClient *client);
-NMDevice *          nm_client_get_device_by_path        (NMClient *client,
-                                                         const char *object_path);
-NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
-                                                         const char *iface);
-void                (*NMClientActivateFn)               (NMClient *client,
-                                                         NMActiveConnection *active_connection,
-                                                         GError *error,
-                                                         gpointer user_data);
 void                nm_client_activate_connection       (NMClient *client,
                                                          NMConnection *connection,
                                                          NMDevice *device,
                                                          const char *specific_object,
                                                          NMClientActivateFn callback,
                                                          gpointer user_data);
-void                (*NMClientAddActivateFn)            (NMClient *client,
-                                                         NMActiveConnection *connection,
-                                                         const char *new_connection_path,
-                                                         GError *error,
-                                                         gpointer user_data);
 void                nm_client_add_and_activate_connection
                                                         (NMClient *client,
                                                          NMConnection *partial,
@@ -88,32 +82,38 @@ const gpointer user_data);
 void                nm_client_deactivate_connection     (NMClient *client,
                                                          NMActiveConnection *active);
+const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
+NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
+                                                         const char *iface);
+NMDevice *          nm_client_get_device_by_path        (NMClient *client,
+                                                         const char *object_path);
+const GPtrArray *   nm_client_get_devices               (NMClient *client);
+gboolean            nm_client_get_manager_running       (NMClient *client);
+NMClientPermissionResult nm_client_get_permission_result
+                                                        (NMClient *client,
+                                                         NMClientPermission permission);
+NMState             nm_client_get_state                 (NMClient *client);
+const char *        nm_client_get_version               (NMClient *client);
 gboolean            nm_client_networking_get_enabled    (NMClient *client);
 void                nm_client_networking_set_enabled    (NMClient *client,
                                                          gboolean enabled);
-gboolean            nm_client_wireless_get_enabled      (NMClient *client);
-void                nm_client_wireless_set_enabled      (NMClient *client,
+NMClient *          nm_client_new                       (void);
+void                nm_client_sleep                     (NMClient *client,
+                                                         gboolean sleep);
+gboolean            nm_client_wimax_get_enabled         (NMClient *client);
+gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);
+void                nm_client_wimax_set_enabled         (NMClient *client,
                                                          gboolean enabled);
+gboolean            nm_client_wireless_get_enabled      (NMClient *client);
 gboolean            nm_client_wireless_hardware_get_enabled
                                                         (NMClient *client);
-gboolean            nm_client_wwan_get_enabled          (NMClient *client);
-void                nm_client_wwan_set_enabled          (NMClient *client,
+void                nm_client_wireless_set_enabled      (NMClient *client,
                                                          gboolean enabled);
+gboolean            nm_client_wwan_get_enabled          (NMClient *client);
 gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
-gboolean            nm_client_wimax_get_enabled         (NMClient *client);
-void                nm_client_wimax_set_enabled         (NMClient *client,
+void                nm_client_wwan_set_enabled          (NMClient *client,
                                                          gboolean enabled);
-gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);
-const char *        nm_client_get_version               (NMClient *client);
-NMState             nm_client_get_state                 (NMClient *client);
-gboolean            nm_client_get_manager_running       (NMClient *client);
-const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
-void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep);
-NMClientPermissionResult  nm_client_get_permission_result
-                                                        (NMClient *client,
-                                                         NMClientPermission permission);
@@ -156,207 +156,198 @@ const

Details

-

NM_CLIENT_VERSION

-
#define NM_CLIENT_VERSION "version"
-
+

NMClient

+
typedef struct _NMClient NMClient;

-

NM_CLIENT_STATE

-
#define NM_CLIENT_STATE "state"
-
+

NMClientActivateFn ()

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

-

NM_CLIENT_MANAGER_RUNNING

-
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
-
+

NMClientAddActivateFn ()

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

-

NM_CLIENT_NETWORKING_ENABLED

-
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
+
NMClientClass

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

NM_CLIENT_WIRELESS_ENABLED

-
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
+
enum NMClientPermission

+
typedef enum {
+	NM_CLIENT_PERMISSION_NONE = 0,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
+	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4,
+	NM_CLIENT_PERMISSION_SLEEP_WAKE = 5,
+	NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7,
+	NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10,
+	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11,
+
+	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME
+} NMClientPermission;
-

NM_CLIENT_WIRELESS_HARDWARE_ENABLED

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

+
typedef enum {
+	NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0,
+	NM_CLIENT_PERMISSION_RESULT_YES,
+	NM_CLIENT_PERMISSION_RESULT_AUTH,
+	NM_CLIENT_PERMISSION_RESULT_NO
+} NMClientPermissionResult;
-

NM_CLIENT_WWAN_ENABLED

-
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
+
NM_CLIENT_ACTIVE_CONNECTIONS

+
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
-

NM_CLIENT_WWAN_HARDWARE_ENABLED

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

+
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
-

NM_CLIENT_WIMAX_ENABLED

-
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
+
NM_CLIENT_NETWORKING_ENABLED

+
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
-

NM_CLIENT_WIMAX_HARDWARE_ENABLED

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

+
#define NM_CLIENT_STATE "state"
-

NM_CLIENT_ACTIVE_CONNECTIONS

-
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
+
NM_CLIENT_VERSION

+
#define NM_CLIENT_VERSION "version"
-

enum NMClientPermission

-
typedef enum {
-	NM_CLIENT_PERMISSION_NONE = 0,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4,
-	NM_CLIENT_PERMISSION_SLEEP_WAKE = 5,
-	NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6,
-	NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7,
-	NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11,
-
-	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME
-} NMClientPermission;
+
NM_CLIENT_WIMAX_ENABLED

+
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
-

enum NMClientPermissionResult

-
typedef enum {
-	NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0,
-	NM_CLIENT_PERMISSION_RESULT_YES,
-	NM_CLIENT_PERMISSION_RESULT_AUTH,
-	NM_CLIENT_PERMISSION_RESULT_NO
-} NMClientPermissionResult;
+
NM_CLIENT_WIMAX_HARDWARE_ENABLED

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

NMClient

-
typedef struct _NMClient NMClient;
+

NM_CLIENT_WIRELESS_ENABLED

+
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
+

-

NMClientClass

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

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

nm_client_new ()

-
NMClient *          nm_client_new                       (void);
+

NM_CLIENT_WWAN_ENABLED

+
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
+

-Creates a new NMClient.

-
-- - - - -

Returns :

a new NMClient -
-

nm_client_get_devices ()

-
const GPtrArray *   nm_client_get_devices               (NMClient *client);
+

NM_CLIENT_WWAN_HARDWARE_ENABLED

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

-Gets all the detected devices.

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

client :

a NMClient -

Returns :

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

nm_client_get_device_by_path ()

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

nm_client_activate_connection ()

+
void                nm_client_activate_connection       (NMClient *client,
+                                                         NMConnection *connection,
+                                                         NMDevice *device,
+                                                         const char *specific_object,
+                                                         NMClientActivateFn callback,
+                                                         gpointer user_data);

-Gets a NMDevice from a NMClient. +Starts a connection to a particular network using the configuration settings +from connection and the network device device. Certain connection types +also take a "specific object" which is the object path of a connection- +specific object, like an NMAccessPoint for WiFi connections, or an +NMWimaxNsp for WiMAX connections, to which you wish to connect. If the +specific object is not given, NetworkManager can, in some cases, automatically +determine which network to connect to given the settings in connection.

@@ -367,40 +358,34 @@ Gets a - - + + - - + - -

object_path :

the object path to search for

connection :

an NMConnection +

Returns :

the NMDevice for the given object_path or NULL if none is found. [transfer none] +

device :

the NMDevice. [allow-none]
-
-
-
-

nm_client_get_device_by_iface ()

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

-Gets a NMDevice from a NMClient. -

-
-- - - + - - + + - - + @@ -408,31 +393,19 @@ Gets a
-

NMClientActivateFn ()

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

-

-
-
-
-

nm_client_activate_connection ()

-
void                nm_client_activate_connection       (NMClient *client,
-                                                         NMConnection *connection,
+
nm_client_add_and_activate_connection ()

+
void                nm_client_add_and_activate_connection
+                                                        (NMClient *client,
+                                                         NMConnection *partial,
                                                          NMDevice *device,
                                                          const char *specific_object,
-                                                         NMClientActivateFn callback,
+                                                         NMClientAddActivateFn callback,
                                                          gpointer user_data);

 

-Starts a connection to a particular network using the configuration settings
-from connection and the network device device.  Certain connection types
-also take a "specific object" which is the object path of a connection-
-specific object, like an NMAccessPoint for WiFi connections, or an
-NMWimaxNsp for WiMAX connections, to which you wish to connect.  If the
-specific object is not given, NetworkManager can, in some cases, automatically
-determine which network to connect to given the settings in connection.
+Adds a new connection using the given details (if any) as a template,
+automatically filling in missing settings with the capabilities of the
+given device and specific object.  The new connection is then activated.
+Cannot be used for VPN connections at this time.

client :

a NMClient +

specific_object :

the object path of a connection-type-specific +object this activation should use. This parameter is currently ignored for +wired and mobile broadband connections, and the value of NULL should be used +(ie, no specific object). For WiFi or WiMAX connections, pass the object +path of a NMAccessPoint or NMWimaxNsp owned by device, which you can +get using nm_object_get_path(), and which will be used to complete the +details of the newly added connection. [allow-none]

iface :

the interface name to search for

callback :

the function to call when the call is done. [scope async][allow-none] +

Returns :

the NMDevice for the given iface or NULL if none is found. [transfer none] +

user_data :

user data to pass to the callback function. [closure]
@@ -443,13 +416,15 @@ determine which network to connect to given the settings in connection :

- + - @@ -478,30 +453,59 @@ details of the newly added connection. [
-

NMClientAddActivateFn ()

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

nm_client_deactivate_connection ()

+
void                nm_client_deactivate_connection     (NMClient *client,
+                                                         NMActiveConnection *active);

+Deactivates an active NMActiveConnection.

+
an NMConnection +

partial :

an NMConnection to add; the connection may be +partially filled (or even NULL) and will be completed by NetworkManager +using the given device and specific_object before being added. [allow-none]

device :

the NMDevice. [allow-none] +the NMDevice
++ + + + + + + + + + +

client :

a NMClient +

active :

the NMActiveConnection to deactivate
-

nm_client_add_and_activate_connection ()

-
void                nm_client_add_and_activate_connection
-                                                        (NMClient *client,
-                                                         NMConnection *partial,
-                                                         NMDevice *device,
-                                                         const char *specific_object,
-                                                         NMClientAddActivateFn callback,
-                                                         gpointer user_data);
+

nm_client_get_active_connections ()

+
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

-Adds a new connection using the given details (if any) as a template, -automatically filling in missing settings with the capabilities of the -given device and specific object. The new connection is then activated. -Cannot be used for VPN connections at this time. +Gets the active connections. +

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

client :

a NMClient +

Returns :

a GPtrArray +containing all the active NMActiveConnections. +The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.ActiveConnection] +
+
+
+
+

nm_client_get_device_by_iface ()

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

+Gets a NMDevice from a NMClient.

@@ -512,36 +516,12 @@ Cannot be used for VPN connections at this time. - - - - - - - - - - - - - - + + - - + @@ -549,11 +529,11 @@ details of the newly added connection. [
-

nm_client_deactivate_connection ()

-
void                nm_client_deactivate_connection     (NMClient *client,
-                                                         NMActiveConnection *active);
+

nm_client_get_device_by_path ()

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

-Deactivates an active NMActiveConnection. +Gets a NMDevice from a NMClient.

partial :

an NMConnection to add; the connection may be -partially filled (or even NULL) and will be completed by NetworkManager -using the given device and specific_object before being added. [allow-none] -

device :

the NMDevice -

specific_object :

the object path of a connection-type-specific -object this activation should use. This parameter is currently ignored for -wired and mobile broadband connections, and the value of NULL should be used -(ie, no specific object). For WiFi or WiMAX connections, pass the object -path of a NMAccessPoint or NMWimaxNsp owned by device, which you can -get using nm_object_get_path(), and which will be used to complete the -details of the newly added connection. [allow-none] -

callback :

the function to call when the call is done. [scope async][allow-none] -

iface :

the interface name to search for

user_data :

user data to pass to the callback function. [closure] +

Returns :

the NMDevice for the given iface or NULL if none is found. [transfer none]
@@ -564,18 +544,23 @@ Deactivates an active active :

- + + + + + +
the NMActiveConnection to deactivate

object_path :

the object path to search for

Returns :

the NMDevice for the given object_path or NULL if none is found. [transfer none] +
-

nm_client_networking_get_enabled ()

-
gboolean            nm_client_networking_get_enabled    (NMClient *client);
+

nm_client_get_devices ()

+
const GPtrArray *   nm_client_get_devices               (NMClient *client);

-Whether networking is enabled or disabled. +Gets all the detected devices.

@@ -587,21 +572,19 @@ Whether networking is enabled or disabled. - +

Returns :

 -TRUE if networking is enabled, FALSE if networking is disableda GPtrArray containing all the NMDevices. +The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.Device] +
-

nm_client_networking_set_enabled ()

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

nm_client_get_manager_running ()

+
gboolean            nm_client_get_manager_running       (NMClient *client);

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

@@ -612,19 +595,22 @@ all controlled interfaces are available for activation. - + +TRUE if the daemon is running

enabled :

Returns :

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

nm_client_wireless_get_enabled ()

-
gboolean            nm_client_wireless_get_enabled      (NMClient *client);
+

nm_client_get_permission_result ()

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

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

@@ -635,20 +621,24 @@ Determines whether the wireless is enabled. + + + + - +

permission :

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

Returns :

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

nm_client_wireless_set_enabled ()

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

nm_client_get_state ()

+
NMState             nm_client_get_state                 (NMClient *client);

-Enables or disables wireless devices. +Gets the current daemon state.

@@ -659,20 +649,19 @@ Enables or disables wireless devices. - - + +

enabled :

 -TRUE to enable wireless

Returns :

the current NMState +
-

nm_client_wireless_hardware_get_enabled ()

-
gboolean            nm_client_wireless_hardware_get_enabled
-                                                        (NMClient *client);
+

nm_client_get_version ()

+
const char *        nm_client_get_version               (NMClient *client);

-Determines whether the wireless hardware is enabled. +Gets NetworkManager version.

@@ -684,18 +673,17 @@ Determines whether the wireless hardware is enabled. - +

Returns :

 -TRUE if the wireless hardware is enabledstring with the version
-

nm_client_wwan_get_enabled ()

-
gboolean            nm_client_wwan_get_enabled          (NMClient *client);
+

nm_client_networking_get_enabled ()

+
gboolean            nm_client_networking_get_enabled    (NMClient *client);

-Determines whether WWAN is enabled. +Whether networking is enabled or disabled.

@@ -708,18 +696,20 @@ Determines whether WWAN is enabled. +TRUE if networking is enabled, FALSE if networking is disabled

Returns :

 -TRUE if WWAN is enabled
-

nm_client_wwan_set_enabled ()

-
void                nm_client_wwan_set_enabled          (NMClient *client,
+
nm_client_networking_set_enabled ()

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

 

-Enables or disables WWAN devices.
+Enables or disables networking.  When networking is disabled, all controlled
+interfaces are disconnected and deactivated.  When networking is enabled,
+all controlled interfaces are available for activation.
 

 
@@ -732,17 +722,34 @@ Enables or disables WWAN devices.
 
+TRUE to set networking enabled, FALSE to set networking disabled

 


 
enabled :

 
-TRUE to enable WWAN
-

nm_client_wwan_hardware_get_enabled ()

-
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
+

nm_client_new ()

+
NMClient *          nm_client_new                       (void);

-Determines whether the WWAN hardware is enabled. +Creates a new NMClient. +

+
++ + + + +

Returns :

a new NMClient +
+
+
+
+

nm_client_sleep ()

+
void                nm_client_sleep                     (NMClient *client,
+                                                         gboolean sleep);
+

+Deprecated; use nm_client_networking_set_enabled() instead.

@@ -753,9 +760,9 @@ Determines whether the WWAN hardware is enabled. - + +TRUE to put the daemon to sleep

Returns :

sleep :

 -TRUE if the WWAN hardware is enabled
@@ -785,11 +792,11 @@ Determines whether WiMAX is enabled.
-

nm_client_wimax_set_enabled ()

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

nm_client_wimax_hardware_get_enabled ()

+
gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);

-Enables or disables WiMAX devices. +Determines whether the WiMAX hardware is enabled.

@@ -800,20 +807,20 @@ Enables or disables WiMAX devices. - + +TRUE if the WiMAX hardware is enabled

enabled :

Returns :

 -TRUE to enable WiMAX
-

nm_client_wimax_hardware_get_enabled ()

-
gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);
+

nm_client_wimax_set_enabled ()

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

-Determines whether the WiMAX hardware is enabled. +Enables or disables WiMAX devices.

@@ -824,19 +831,19 @@ Determines whether the WiMAX hardware is enabled. - + +TRUE to enable WiMAX

Returns :

enabled :

 -TRUE if the WiMAX hardware is enabled
-

nm_client_get_version ()

-
const char *        nm_client_get_version               (NMClient *client);
+

nm_client_wireless_get_enabled ()

+
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

-Gets NetworkManager version. +Determines whether the wireless is enabled.

@@ -848,17 +855,19 @@ Gets NetworkManager version. - +

Returns :

string with the version +TRUE if wireless is enabled
-

nm_client_get_state ()

-
NMState             nm_client_get_state                 (NMClient *client);
+

nm_client_wireless_hardware_get_enabled ()

+
gboolean            nm_client_wireless_hardware_get_enabled
+                                                        (NMClient *client);

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

@@ -870,18 +879,19 @@ Gets the current daemon state. - +

Returns :

the current NMState - +TRUE if the wireless hardware is enabled
-

nm_client_get_manager_running ()

-
gboolean            nm_client_get_manager_running       (NMClient *client);
+

nm_client_wireless_set_enabled ()

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

-Determines whether the daemon is running. +Enables or disables wireless devices.

@@ -892,19 +902,19 @@ Determines whether the daemon is running. - + +TRUE to enable wireless

Returns :

enabled :

 -TRUE if the daemon is running
-

nm_client_get_active_connections ()

-
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
+

nm_client_wwan_get_enabled ()

+
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

-Gets the active connections. +Determines whether WWAN is enabled.

@@ -916,21 +926,18 @@ Gets the active connections. - +

Returns :

a GPtrArray -containing all the active NMActiveConnections. -The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.ActiveConnection] - +TRUE if WWAN is enabled
-

nm_client_sleep ()

-
void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep);
+

nm_client_wwan_hardware_get_enabled ()

+
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

-Deprecated; use nm_client_networking_set_enabled() instead. +Determines whether the WWAN hardware is enabled.

@@ -941,22 +948,20 @@ Deprecated; use sleep :

+ +TRUE if the WWAN hardware is enabled

Returns :

 -TRUE to put the daemon to sleep
-

nm_client_get_permission_result ()

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

nm_client_wwan_set_enabled ()

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

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

@@ -967,14 +972,9 @@ client can or cannot perform the action the permission represents - - - - - - + +

permission :

the permission for which to return the result, one of NMClientPermission -

Returns :

the permission's result, one of NMClientPermissionResult -

enabled :

 +TRUE to enable WWAN
@@ -1158,6 +1158,6 @@ Notifies that a permission has changed
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html index 49a48faf..902e6f06 100644 --- a/docs/libnm-glib/html/NMDHCP4Config.html +++ b/docs/libnm-glib/html/NMDHCP4Config.html @@ -8,7 +8,7 @@ - + @@ -44,11 +44,11 @@ 
                    NMDHCP4Config;
                     NMDHCP4ConfigClass;
 #define             NM_DHCP4_CONFIG_OPTIONS
-GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
 const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
                                                          const char *option);
+GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
+GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
+                                                         const char *object_path);
@@ -106,28 +106,28 @@ const char * -

nm_dhcp4_config_new ()

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

nm_dhcp4_config_get_one_option ()

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

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

- - + - - + + - +

connection :

the DBusGConnection +

config :

a NMDHCP4Config

object_path :

the DBus object path of the device

option :

the option to retrieve

Returns :

a new configuration. [transfer full] -the configuration option's value. This is the internal string used by the +configuration, and must not be modified.
@@ -158,28 +158,28 @@ This is the internal copy used by the configuration, and must not be modified. <
-

nm_dhcp4_config_get_one_option ()

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

nm_dhcp4_config_new ()

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

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

- - + - - + + - +

config :

a NMDHCP4Config +

connection :

the DBusGConnection

option :

the option to retrieve

object_path :

the DBus object path of the device

Returns :

the configuration option's value. This is the internal string used by the -configuration, and must not be modified.a new configuration. [transfer full] +
@@ -202,6 +202,6 @@ Element-Type: utf8,GObject.Value
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html index 2b330a1b..757e6cdf 100644 --- a/docs/libnm-glib/html/NMDHCP6Config.html +++ b/docs/libnm-glib/html/NMDHCP6Config.html @@ -8,7 +8,7 @@ - + @@ -44,11 +44,11 @@ 
                    NMDHCP6Config;
                     NMDHCP6ConfigClass;
 #define             NM_DHCP6_CONFIG_OPTIONS
-GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
 const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
                                                          const char *option);
+GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
+GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
+                                                         const char *object_path);
@@ -106,28 +106,28 @@ const char * -

nm_dhcp6_config_new ()

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

nm_dhcp6_config_get_one_option ()

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

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

- - + - - + + - +

connection :

the DBusGConnection +

config :

a NMDHCP6Config

object_path :

the DBus object path of the device

option :

the option to retrieve

Returns :

a new configuration. [transfer full] -the configuration option's value. This is the internal string used by the +configuration, and must not be modified.
@@ -158,28 +158,28 @@ This is the internal copy used by the configuration, and must not be modified. <
-

nm_dhcp6_config_get_one_option ()

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

nm_dhcp6_config_new ()

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

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

- - + - - + + - +

config :

a NMDHCP6Config +

connection :

the DBusGConnection

option :

the option to retrieve

object_path :

the DBus object path of the device

Returns :

the configuration option's value. This is the internal string used by the -configuration, and must not be modified.a new configuration. [transfer full] +
@@ -202,6 +202,6 @@ Element-Type: utf8,GObject.Value
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 94866102..0ffed799 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -8,7 +8,7 @@ - + @@ -43,52 +43,52 @@

Synopsis

-
#define             NM_DEVICE_DEVICE_TYPE
-#define             NM_DEVICE_UDI
-#define             NM_DEVICE_INTERFACE
-#define             NM_DEVICE_IP_INTERFACE
-#define             NM_DEVICE_DRIVER
+
                    NMDevice;
+                    NMDeviceClass;
+void                (*NMDeviceDeactivateFn)             (NMDevice *device,
+                                                         GError *error,
+                                                         gpointer user_data);
+#define             NM_DEVICE_ACTIVE_CONNECTION
 #define             NM_DEVICE_CAPABILITIES
-#define             NM_DEVICE_MANAGED
+#define             NM_DEVICE_DEVICE_TYPE
+#define             NM_DEVICE_DHCP4_CONFIG
+#define             NM_DEVICE_DHCP6_CONFIG
+#define             NM_DEVICE_DRIVER
 #define             NM_DEVICE_FIRMWARE_MISSING
+#define             NM_DEVICE_INTERFACE
 #define             NM_DEVICE_IP4_CONFIG
-#define             NM_DEVICE_DHCP4_CONFIG
 #define             NM_DEVICE_IP6_CONFIG
-#define             NM_DEVICE_DHCP6_CONFIG
+#define             NM_DEVICE_IP_INTERFACE
+#define             NM_DEVICE_MANAGED
+#define             NM_DEVICE_PRODUCT
 #define             NM_DEVICE_STATE
-#define             NM_DEVICE_ACTIVE_CONNECTION
+#define             NM_DEVICE_UDI
 #define             NM_DEVICE_VENDOR
-#define             NM_DEVICE_PRODUCT
-                    NMDevice;
-                    NMDeviceClass;
-GObject *           nm_device_new                       (DBusGConnection *connection,
-                                                         const char *path);
-const char *          nm_device_get_iface               (NMDevice *device);
-const char *          nm_device_get_ip_iface            (NMDevice *device);
-NMDeviceType        nm_device_get_device_type           (NMDevice *device);
-const char *          nm_device_get_udi                 (NMDevice *device);
-const char *          nm_device_get_driver              (NMDevice *device);
-NMDeviceCapabilities  nm_device_get_capabilities        (NMDevice *device);
-gboolean            nm_device_get_managed               (NMDevice *device);
-gboolean            nm_device_get_firmware_missing      (NMDevice *device);
-NMIP4Config *         nm_device_get_ip4_config          (NMDevice *device);
-NMDHCP4Config *       nm_device_get_dhcp4_config        (NMDevice *device);
-NMIP6Config *         nm_device_get_ip6_config          (NMDevice *device);
-NMDHCP6Config *       nm_device_get_dhcp6_config        (NMDevice *device);
-NMDeviceState       nm_device_get_state                 (NMDevice *device);
-NMActiveConnection *  nm_device_get_active_connection   (NMDevice *device);
-const char *          nm_device_get_product             (NMDevice *device);
-const char *          nm_device_get_vendor              (NMDevice *device);
-void                (*NMDeviceDeactivateFn)             (NMDevice *device,
-                                                         GError *error,
-                                                         gpointer user_data);
+gboolean            nm_device_connection_valid          (NMDevice *device,
+                                                         NMConnection *connection);
 void                nm_device_disconnect                (NMDevice *device,
                                                          NMDeviceDeactivateFn callback,
                                                          gpointer user_data);
-GSList *              nm_device_filter_connections      (NMDevice *device,
+GSList *            nm_device_filter_connections        (NMDevice *device,
                                                          const GSList *connections);
-gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
+NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);
+NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
+NMDeviceType        nm_device_get_device_type           (NMDevice *device);
+NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);
+NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
+const char *        nm_device_get_driver                (NMDevice *device);
+gboolean            nm_device_get_firmware_missing      (NMDevice *device);
+const char *        nm_device_get_iface                 (NMDevice *device);
+NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);
+NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);
+const char *        nm_device_get_ip_iface              (NMDevice *device);
+gboolean            nm_device_get_managed               (NMDevice *device);
+const char *        nm_device_get_product               (NMDevice *device);
+NMDeviceState       nm_device_get_state                 (NMDevice *device);
+const char *        nm_device_get_udi                   (NMDevice *device);
+const char *        nm_device_get_vendor                (NMDevice *device);
+GObject *           nm_device_new                       (DBusGConnection *connection,
+                                                         const char *path);
@@ -139,120 +139,139 @@ const char *

Details

-

NM_DEVICE_DEVICE_TYPE

-
#define NM_DEVICE_DEVICE_TYPE "device-type"
-
+

NMDevice

+
typedef struct _NMDevice NMDevice;

-

NM_DEVICE_UDI

-
#define NM_DEVICE_UDI "udi"
+
NMDeviceClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Signals */
+	void (*state_changed) (NMDevice *device,
+	                       NMDeviceState new_state,
+	                       NMDeviceState old_state,
+	                       NMDeviceStateReason reason);
+
+	gboolean (*connection_valid)   (NMDevice *device,
+	                                NMConnection *connection);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceClass;
-

NM_DEVICE_INTERFACE

-
#define NM_DEVICE_INTERFACE "interface"
-
+

NMDeviceDeactivateFn ()

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

-

NM_DEVICE_IP_INTERFACE

-
#define NM_DEVICE_IP_INTERFACE "ip-interface"
+
NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
-

NM_DEVICE_DRIVER

-
#define NM_DEVICE_DRIVER "driver"
+
NM_DEVICE_CAPABILITIES

+
#define NM_DEVICE_CAPABILITIES "capabilities"
-

NM_DEVICE_CAPABILITIES

-
#define NM_DEVICE_CAPABILITIES "capabilities"
+
NM_DEVICE_DEVICE_TYPE

+
#define NM_DEVICE_DEVICE_TYPE "device-type"
-

NM_DEVICE_MANAGED

-
#define NM_DEVICE_MANAGED "managed"
+
NM_DEVICE_DHCP4_CONFIG

+
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
-

NM_DEVICE_FIRMWARE_MISSING

-
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
+
NM_DEVICE_DHCP6_CONFIG

+
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
-

NM_DEVICE_IP4_CONFIG

-
#define NM_DEVICE_IP4_CONFIG "ip4-config"
+
NM_DEVICE_DRIVER

+
#define NM_DEVICE_DRIVER "driver"
-

NM_DEVICE_DHCP4_CONFIG

-
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
+
NM_DEVICE_FIRMWARE_MISSING

+
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
-

NM_DEVICE_IP6_CONFIG

-
#define NM_DEVICE_IP6_CONFIG "ip6-config"
+
NM_DEVICE_INTERFACE

+
#define NM_DEVICE_INTERFACE "interface"
-

NM_DEVICE_DHCP6_CONFIG

-
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
+
NM_DEVICE_IP4_CONFIG

+
#define NM_DEVICE_IP4_CONFIG "ip4-config"
-

NM_DEVICE_STATE

-
#define NM_DEVICE_STATE "state"
+
NM_DEVICE_IP6_CONFIG

+
#define NM_DEVICE_IP6_CONFIG "ip6-config"
-

NM_DEVICE_ACTIVE_CONNECTION

-
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+
NM_DEVICE_IP_INTERFACE

+
#define NM_DEVICE_IP_INTERFACE "ip-interface"
-

NM_DEVICE_VENDOR

-
#define NM_DEVICE_VENDOR "vendor"
+
NM_DEVICE_MANAGED

+
#define NM_DEVICE_MANAGED "managed"
 

 

 

@@ -267,72 +286,73 @@ const char *          
-
NMDevice

-
typedef struct _NMDevice NMDevice;

+
NM_DEVICE_STATE

+
#define NM_DEVICE_STATE "state"
+
-

NMDeviceClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Signals */
-	void (*state_changed) (NMDevice *device,
-	                       NMDeviceState new_state,
-	                       NMDeviceState old_state,
-	                       NMDeviceStateReason reason);
-
-	gboolean (*connection_valid)   (NMDevice *device,
-	                                NMConnection *connection);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceClass;
+
NM_DEVICE_UDI

+
#define NM_DEVICE_UDI "udi"
-

nm_device_new ()

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

NM_DEVICE_VENDOR

+
#define NM_DEVICE_VENDOR "vendor"
+

-Creates a new NMDevice. +

+
+
+
+

nm_device_connection_valid ()

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

+Validates a given connection for a given NMDevice object and returns +whether the connection may be activated with the device. For example if +device is a WiFi device that supports only WEP encryption, the connection +will only be valid if it is a WiFi connection which describes a WEP or open +network, and will not be valid if it describes a WPA network, or if it is +an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the +device.

- - + + - - + + - +

connection :

the DBusGConnection -

device :

an NMDevice to validate connection against

path :

the DBus object path of the device

connection :

an NMConnection to validate against device +

Returns :

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

nm_device_get_iface ()

-
const char *          nm_device_get_iface               (NMDevice *device);
+

nm_device_disconnect ()

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

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

@@ -343,43 +363,63 @@ Gets the interface name of the Returns :

- + + + + + +
the interface of the device. This is the internal string used by the -device, and must not be modified.

callback :

callback to be called when disconnect +operation completes. [scope async][allow-none] +

user_data :

caller-specific data passed to callback. [closure] +
-

nm_device_get_ip_iface ()

-
const char *          nm_device_get_ip_iface            (NMDevice *device);
+

nm_device_filter_connections ()

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

-Gets the IP interface name of the NMDevice over which IP traffic flows -when the device is in the ACTIVATED state. +Filters a given list of connections for a given NMDevice object and return +connections which may be activated with the device. For example if device +is a WiFi device that supports only WEP encryption, the returned list will +contain any WiFi connections in connections that allow connection to +unencrypted or WEP-enabled SSIDs. The returned list will not contain +Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is +incompatible with the device.

- + + + + - +

device :

a NMDevice +an NMDevice to filter connections for

connections :

a list of NMConnection objects to filter. [element-type NetworkManager.Connection]

Returns :

the IP traffic interface of the device. This is the internal string -used by the device, and must not be modified.a +list of NMConnection objects that could be activated with the given device. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] +
-

nm_device_get_device_type ()

-
NMDeviceType        nm_device_get_device_type           (NMDevice *device);
+

nm_device_get_active_connection ()

+
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);

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

@@ -391,17 +431,19 @@ Returns the numeric type of the Returns :

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

nm_device_get_udi ()

-
const char *          nm_device_get_udi                 (NMDevice *device);
+

nm_device_get_capabilities ()

+
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

-Gets the Unique Device Identifier of the NMDevice. +Gets the device' capabilities.

@@ -413,19 +455,17 @@ Gets the Unique Device Identifier of the - +

Returns :

the Unique Device Identifier of the device. This identifier may be -used to gather more information about the device from various operating -system services like udev or sysfs.the capabilities
-

nm_device_get_driver ()

-
const char *          nm_device_get_driver              (NMDevice *device);
+

nm_device_get_device_type ()

+
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

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

@@ -437,18 +477,17 @@ Gets the driver of the - +

Returns :

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

nm_device_get_capabilities ()

-
NMDeviceCapabilities  nm_device_get_capabilities        (NMDevice *device);
+

nm_device_get_dhcp4_config ()

+
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

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

@@ -460,17 +499,19 @@ Gets the device' capabilities. - +

Returns :

the capabilitiesthe NMDHCPConfig or NULL if the device is not activated or not +using DHCP. [transfer none] +
-

nm_device_get_managed ()

-
gboolean            nm_device_get_managed               (NMDevice *device);
+

nm_device_get_dhcp6_config ()

+
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

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

@@ -482,19 +523,19 @@ Whether the Returns :

- +
-TRUE if the device is managed by NetworkManagerthe NMDHCPConfig or NULL if the device is not activated or not +using DHCP. [transfer none] +
-

nm_device_get_firmware_missing ()

-
gboolean            nm_device_get_firmware_missing      (NMDevice *device);
+

nm_device_get_driver ()

+
const char *        nm_device_get_driver                (NMDevice *device);

-Indicates that firmware required for the device's operation is likely -to be missing. +Gets the driver of the NMDevice.

@@ -506,19 +547,19 @@ to be missing. - +

Returns :

 -TRUE if firmware required for the device's operation is likely -to be missing.the driver of the device. This is the internal string used by the +device, and must not be modified.
-

nm_device_get_ip4_config ()

-
NMIP4Config *         nm_device_get_ip4_config          (NMDevice *device);
+

nm_device_get_firmware_missing ()

+
gboolean            nm_device_get_firmware_missing      (NMDevice *device);

-Gets the current NMIP4Config associated with the NMDevice. +Indicates that firmware required for the device's operation is likely +to be missing.

@@ -530,18 +571,19 @@ Gets the current - +

Returns :

the NMIP4Config or NULL if the device is not activated. [transfer none] - +TRUE if firmware required for the device's operation is likely +to be missing.
-

nm_device_get_dhcp4_config ()

-
NMDHCP4Config *       nm_device_get_dhcp4_config        (NMDevice *device);
+

nm_device_get_iface ()

+
const char *        nm_device_get_iface                 (NMDevice *device);

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

@@ -553,19 +595,18 @@ Gets the current - +

Returns :

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

nm_device_get_ip6_config ()

-
NMIP6Config *         nm_device_get_ip6_config          (NMDevice *device);
+

nm_device_get_ip4_config ()

+
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

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

@@ -577,7 +618,7 @@ Gets the current - @@ -585,10 +626,10 @@ Gets the current
-

nm_device_get_dhcp6_config ()

-
NMDHCP6Config *       nm_device_get_dhcp6_config        (NMDevice *device);
+

nm_device_get_ip6_config ()

+
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

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

Returns :

the NMIP6Config or NULL if the device is not activated. [transfer none] +the NMIP4Config or NULL if the device is not activated. [transfer none]
@@ -600,8 +641,7 @@ Gets the current - @@ -609,10 +649,11 @@ using DHCP. [ -

nm_device_get_state ()

-
NMDeviceState       nm_device_get_state                 (NMDevice *device);
+

nm_device_get_ip_iface ()

+
const char *        nm_device_get_ip_iface              (NMDevice *device);

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

Returns :

the NMDHCPConfig or NULL if the device is not activated or not -using DHCP. [transfer none] +the NMIP6Config or NULL if the device is not activated. [transfer none]
@@ -624,17 +665,18 @@ Gets the current - +

Returns :

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

nm_device_get_active_connection ()

-
NMActiveConnection *  nm_device_get_active_connection   (NMDevice *device);
+

nm_device_get_managed ()

+
gboolean            nm_device_get_managed               (NMDevice *device);

-Gets the NMActiveConnection object which owns this device during activation. +Whether the NMDevice is managed by NetworkManager.

@@ -646,9 +688,8 @@ Gets the Returns :

- +
the NMActiveConnection or NULL if the device is -not part of an active connection. [transfer none] - +TRUE if the device is managed by NetworkManager
@@ -656,7 +697,7 @@ not part of an active connection. [

nm_device_get_product ()

-
const char *          nm_device_get_product             (NMDevice *device);
+
const char *        nm_device_get_product               (NMDevice *device);

Gets the product string of the NMDevice.

@@ -678,10 +719,10 @@ device, and must not be modified.
-

nm_device_get_vendor ()

-
const char *          nm_device_get_vendor              (NMDevice *device);
+

nm_device_get_state ()

+
NMDeviceState       nm_device_get_state                 (NMDevice *device);

-Gets the vendor string of the NMDevice. +Gets the current NMDevice state.

@@ -693,31 +734,17 @@ Gets the vendor string of the Returns :

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

NMDeviceDeactivateFn ()

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

-

-
-
-
-

nm_device_disconnect ()

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

nm_device_get_udi ()

+
const char *        nm_device_get_udi                   (NMDevice *device);

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

@@ -728,88 +755,61 @@ request. - - - - - - + +

callback :

callback to be called when disconnect -operation completes. [scope async][allow-none] -

user_data :

caller-specific data passed to callback. [closure] -

Returns :

the Unique Device Identifier of the device. This identifier may be +used to gather more information about the device from various operating +system services like udev or sysfs.
-

nm_device_filter_connections ()

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

nm_device_get_vendor ()

+
const char *        nm_device_get_vendor                (NMDevice *device);

-Filters a given list of connections for a given NMDevice object and return -connections which may be activated with the device. For example if device -is a WiFi device that supports only WEP encryption, the returned list will -contain any WiFi connections in connections that allow connection to -unencrypted or WEP-enabled SSIDs. The returned list will not contain -Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is -incompatible with the device. +Gets the vendor string of the NMDevice.

- - - - - - +

device :

an NMDevice to filter connections for

connections :

a list of NMConnection objects to filter. [element-type NetworkManager.Connection] +a NMDevice

Returns :

a -list of NMConnection objects that could be activated with the given device. -The elements of the list are owned by their creator and should not be freed -by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] -the vendor name of the device. This is the internal string used by the +device, and must not be modified.
-

nm_device_connection_valid ()

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

nm_device_new ()

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

-Validates a given connection for a given NMDevice object and returns -whether the connection may be activated with the device. For example if -device is a WiFi device that supports only WEP encryption, the connection -will only be valid if it is a WiFi connection which describes a WEP or open -network, and will not be valid if it describes a WPA network, or if it is -an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the -device. +Creates a new NMDevice.

- - - - - + + + + - +

device :

an NMDevice to validate connection against

connection :

an NMConnection to validate against device +the DBusGConnection

path :

the DBus object path of the device

Returns :

 -TRUE if the connection may be activated with this device, FALSE -if is incompatible with the device's capabilities and characteristics.a new device. [transfer full] +
@@ -997,6 +997,6 @@ Notifies the state change of a
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html index 6618973f..f69db886 100644 --- a/docs/libnm-glib/html/NMDeviceBt.html +++ b/docs/libnm-glib/html/NMDeviceBt.html @@ -8,7 +8,7 @@ - + @@ -41,16 +41,16 @@

Synopsis

-
#define             NM_DEVICE_BT_HW_ADDRESS
-#define             NM_DEVICE_BT_NAME
-#define             NM_DEVICE_BT_CAPABILITIES
-                    NMDeviceBt;
+
                    NMDeviceBt;
                     NMDeviceBtClass;
-GObject *           nm_device_bt_new                    (DBusGConnection *connection,
-                                                         const char *path);
+#define             NM_DEVICE_BT_CAPABILITIES
+#define             NM_DEVICE_BT_HW_ADDRESS
+#define             NM_DEVICE_BT_NAME
+NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);
 const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);
 const char *        nm_device_bt_get_name               (NMDeviceBt *device);
-NMBluetoothCapabilities  nm_device_bt_get_capabilities  (NMDeviceBt *device);
+GObject *           nm_device_bt_new                    (DBusGConnection *connection,
+                                                         const char *path);
@@ -78,16 +78,25 @@ const char *

Details

-

NM_DEVICE_BT_HW_ADDRESS

-
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
-
+

NMDeviceBt

+
typedef struct _NMDeviceBt NMDeviceBt;

-

NM_DEVICE_BT_NAME

-
#define NM_DEVICE_BT_NAME         "name"
+
NMDeviceBtClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceBtClass;
 

 

 

@@ -102,52 +111,38 @@ const char *        
-
NMDeviceBt

-
typedef struct _NMDeviceBt NMDeviceBt;

+
NM_DEVICE_BT_HW_ADDRESS

+
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
+
-

NMDeviceBtClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceBtClass;
+
NM_DEVICE_BT_NAME

+
#define NM_DEVICE_BT_NAME         "name"
-

nm_device_bt_new ()

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

nm_device_bt_get_capabilities ()

+
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

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

- - + - - - - - @@ -200,22 +195,27 @@ Gets the name of the <
-

nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities  nm_device_bt_get_capabilities  (NMDeviceBt *device);
+

nm_device_bt_new ()

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

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

connection :

the DBusGConnection +

device :

a NMDeviceBt

path :

the DBus object path of the device

Returns :

a new device. [transfer full] +a combination of NMBluetoothCapabilities
- - + + + + + - @@ -254,6 +254,6 @@ The name of the bluetooth device.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html index 8dd99479..cdadb509 100644 --- a/docs/libnm-glib/html/NMDeviceEthernet.html +++ b/docs/libnm-glib/html/NMDeviceEthernet.html @@ -8,7 +8,7 @@ - + @@ -41,19 +41,19 @@

device :

a NMDeviceBt +

connection :

the DBusGConnection

path :

the DBus object path of the device

Returns :

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

Synopsis

-
#define             NM_DEVICE_ETHERNET_HW_ADDRESS
+
                    NMDeviceEthernet;
+                    NMDeviceEthernetClass;
+#define             NM_DEVICE_ETHERNET_CARRIER
+#define             NM_DEVICE_ETHERNET_HW_ADDRESS
 #define             NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 #define             NM_DEVICE_ETHERNET_SPEED
-#define             NM_DEVICE_ETHERNET_CARRIER
-                    NMDeviceEthernet;
-                    NMDeviceEthernetClass;
-GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
-                                                         const char *path);
+gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
 const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);
 const char *        nm_device_ethernet_get_permanent_hw_address
                                                         (NMDeviceEthernet *device);
 guint32             nm_device_ethernet_get_speed        (NMDeviceEthernet *device);
-gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
+GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
+                                                         const char *path);
@@ -82,85 +82,80 @@ const char *

Details

-

NM_DEVICE_ETHERNET_HW_ADDRESS

-
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
-
+

NMDeviceEthernet

+
typedef struct _NMDeviceEthernet NMDeviceEthernet;

-

NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

-
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
+
NMDeviceEthernetClass

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

NM_DEVICE_ETHERNET_SPEED

-
#define NM_DEVICE_ETHERNET_SPEED       "speed"
+
NM_DEVICE_ETHERNET_CARRIER

+
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
-

NM_DEVICE_ETHERNET_CARRIER

-
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+
NM_DEVICE_ETHERNET_HW_ADDRESS

+
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
-

NMDeviceEthernet

-
typedef struct _NMDeviceEthernet NMDeviceEthernet;
+

NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

+
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
+

-

NMDeviceEthernetClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceEthernetClass;
+
NM_DEVICE_ETHERNET_SPEED

+
#define NM_DEVICE_ETHERNET_SPEED       "speed"
-

nm_device_ethernet_new ()

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

nm_device_ethernet_get_carrier ()

+
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

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

- - + - - - - - +

connection :

the DBusGConnection +

device :

a NMDeviceEthernet

path :

the DBus object path of the device

Returns :

a new device. [transfer full] - +TRUE if the device has carrier
@@ -236,23 +231,28 @@ Gets the speed of the -

nm_device_ethernet_get_carrier ()

-
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
+

nm_device_ethernet_new ()

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

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

- - + + + + + - +

device :

a NMDeviceEthernet +

connection :

the DBusGConnection

path :

the DBus object path of the device

Returns :

 -TRUE if the device has carriera new device. [transfer full] +
@@ -299,6 +299,6 @@ The speed of the device.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html index 79db5c9d..0ab7408d 100644 --- a/docs/libnm-glib/html/NMDeviceModem.html +++ b/docs/libnm-glib/html/NMDeviceModem.html @@ -8,7 +8,7 @@ - + @@ -41,13 +41,13 @@

Synopsis

-
#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
-#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
-                    NMDeviceModem;
+
                    NMDeviceModem;
                     NMDeviceModemClass;
-NMDeviceModemCapabilities  nm_device_modem_get_modem_capabilities
+#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
+NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
                                                         (NMDeviceModem *self);
-NMDeviceModemCapabilities  nm_device_modem_get_current_capabilities
+NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
                                                         (NMDeviceModem *self);
@@ -75,22 +75,6 @@

Details

-

NM_DEVICE_MODEM_MODEM_CAPABILITIES

-
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
-
-

-

-
-
-
-

NM_DEVICE_MODEM_CURRENT_CAPABILITIES

-
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
-
-

-

-
-
-

NMDeviceModem

typedef struct _NMDeviceModem NMDeviceModem;

@@ -116,13 +100,29 @@

-

nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities  nm_device_modem_get_modem_capabilities
+
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

+
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+

+

+

+
+
+
+

NM_DEVICE_MODEM_MODEM_CAPABILITIES

+
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
+
+

+

+
+
+
+

nm_device_modem_get_current_capabilities ()

+
NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
                                                         (NMDeviceModem *self);

Returns a bitfield of the generic access technology families the modem -supports. Not all capabilities are available concurrently however; some -may require a firmware reload or reinitialization. +supports without a firmware reload or reinitialization. This value +represents the network types the modem can immediately connect to.

@@ -134,20 +134,21 @@ may require a firmware reload or reinitialization. - +

Returns :

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

nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities  nm_device_modem_get_current_capabilities
+
nm_device_modem_get_modem_capabilities ()

+
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
                                                         (NMDeviceModem *self);

 

 Returns a bitfield of the generic access technology families the modem
-supports without a firmware reload or reinitialization.  This value
-represents the network types the modem can immediately connect to.
+supports.  Not all capabilities are available concurrently however; some
+may require a firmware reload or reinitialization.
 

 
@@ -159,8 +160,7 @@ represents the network types the modem can immediately connect to.
 
-
+

 

 

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

 
 

@@ -193,6 +193,6 @@ CDMA/EVDO and GSM/UMTS.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index b107ad45..fe9c3021 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -8,7 +8,7 @@ - + @@ -43,30 +43,29 @@

Synopsis

-
#define             NM_DEVICE_WIFI_HW_ADDRESS
-#define             NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-#define             NM_DEVICE_WIFI_MODE
-#define             NM_DEVICE_WIFI_BITRATE
+
                    NMDeviceWifi;
+                    NMDeviceWifiClass;
 #define             NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
+#define             NM_DEVICE_WIFI_BITRATE
 #define             NM_DEVICE_WIFI_CAPABILITIES
-                    NMDeviceWifi;
-                    NMDeviceWifiClass;
-GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
+#define             NM_DEVICE_WIFI_HW_ADDRESS
+#define             NM_DEVICE_WIFI_MODE
+#define             NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
+NMAccessPoint *     nm_device_wifi_get_access_point_by_path
+                                                        (NMDeviceWifi *device,
                                                          const char *path);
-const char *              nm_device_wifi_get_hw_address (NMDeviceWifi *device);
-const char *              nm_device_wifi_get_permanent_hw_address
+const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
+NMAccessPoint *     nm_device_wifi_get_active_access_point
                                                         (NMDeviceWifi *device);
-NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
 guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);
-NMDeviceWifiCapabilities  nm_device_wifi_get_capabilities
+NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
                                                         (NMDeviceWifi *device);
-NMAccessPoint *           nm_device_wifi_get_active_access_point
+const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);
+NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
+const char *        nm_device_wifi_get_permanent_hw_address
                                                         (NMDeviceWifi *device);
-NMAccessPoint *           nm_device_wifi_get_access_point_by_path
-                                                        (NMDeviceWifi *device,
+GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
                                                          const char *path);
-const GPtrArray *         nm_device_wifi_get_access_points
-                                                        (NMDeviceWifi *device);
@@ -104,24 +103,37 @@ const

Details

-

NM_DEVICE_WIFI_HW_ADDRESS

-
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
-
+

NMDeviceWifi

+
typedef struct _NMDeviceWifi NMDeviceWifi;

-

NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

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

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

NM_DEVICE_WIFI_MODE

-
#define NM_DEVICE_WIFI_MODE                "mode"
+
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

+
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

 

 

@@ -136,72 +148,60 @@ const 
-
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

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

+
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
-

NM_DEVICE_WIFI_CAPABILITIES

-
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
+
NM_DEVICE_WIFI_HW_ADDRESS

+
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
-

NMDeviceWifi

-
typedef struct _NMDeviceWifi NMDeviceWifi;
+

NM_DEVICE_WIFI_MODE

+
#define NM_DEVICE_WIFI_MODE                "mode"
+

-

NMDeviceWifiClass

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

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

nm_device_wifi_new ()

-
GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
+
nm_device_wifi_get_access_point_by_path ()

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

 

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

 

-
-
+
-
+
-
@@ -209,10 +209,10 @@ Creates a new 
 

 

-
nm_device_wifi_get_hw_address ()

-
const char *              nm_device_wifi_get_hw_address (NMDeviceWifi *device);

+
nm_device_wifi_get_access_points ()

+
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

 

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

 

 
 
 
connection :
the DBusGConnection
+
device :
a NMDeviceWifi
 
 

 

 
path :
the DBus object path of the devicethe object path of the access point
 

 

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

 
@@ -224,19 +224,21 @@ Gets the actual hardware (MAC) address of the Returns :

-
+

 

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

nm_device_wifi_get_permanent_hw_address ()

-
const char *              nm_device_wifi_get_permanent_hw_address
+
nm_device_wifi_get_active_access_point ()

+
NMAccessPoint *     nm_device_wifi_get_active_access_point
                                                         (NMDeviceWifi *device);

 

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

 
@@ -248,18 +250,18 @@ Gets the permanent hardware (MAC) address of the Returns :

-
+

 

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

nm_device_wifi_get_mode ()

-
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
+

nm_device_wifi_get_bitrate ()

+
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

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

@@ -271,17 +273,18 @@ Gets the - +

Returns :

the modethe bit rate
-

nm_device_wifi_get_bitrate ()

-
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);
+

nm_device_wifi_get_capabilities ()

+
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
+                                                        (NMDeviceWifi *device);

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

@@ -293,18 +296,17 @@ Gets the bit rate of the Returns :

- +
the bit ratethe capabilities
-

nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities  nm_device_wifi_get_capabilities
-                                                        (NMDeviceWifi *device);
+

nm_device_wifi_get_hw_address ()

+
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

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

@@ -316,18 +318,18 @@ Gets the WIFI capabilities of the - +

Returns :

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

nm_device_wifi_get_active_access_point ()

-
NMAccessPoint *           nm_device_wifi_get_active_access_point
-                                                        (NMDeviceWifi *device);
+

nm_device_wifi_get_mode ()

+
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

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

@@ -339,20 +341,18 @@ Gets the active - +

Returns :

the access point or NULL if none is active. [transfer none] -the mode
-

nm_device_wifi_get_access_point_by_path ()

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

nm_device_wifi_get_permanent_hw_address ()

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

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

@@ -363,38 +363,36 @@ Gets a - - - - - +

path :

the object path of the access point

Returns :

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

nm_device_wifi_get_access_points ()

-
const GPtrArray *         nm_device_wifi_get_access_points
-                                                        (NMDeviceWifi *device);
+

nm_device_wifi_new ()

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

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

- - + + + + + - @@ -516,6 +514,6 @@ Notifies that a
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index e24928d7..33bd2509 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -8,7 +8,7 @@ - + @@ -43,28 +43,28 @@

device :

a NMDeviceWifi +

connection :

the DBusGConnection

path :

the DBus object path of the device

Returns :

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

Synopsis

-
#define             NM_DEVICE_WIMAX_HW_ADDRESS
+
                    NMDeviceWimax;
+                    NMDeviceWimaxClass;
 #define             NM_DEVICE_WIMAX_ACTIVE_NSP
+#define             NM_DEVICE_WIMAX_BSID
 #define             NM_DEVICE_WIMAX_CENTER_FREQUENCY
-#define             NM_DEVICE_WIMAX_RSSI
 #define             NM_DEVICE_WIMAX_CINR
+#define             NM_DEVICE_WIMAX_HW_ADDRESS
+#define             NM_DEVICE_WIMAX_RSSI
 #define             NM_DEVICE_WIMAX_TX_POWER
-#define             NM_DEVICE_WIMAX_BSID
-                    NMDeviceWimax;
-                    NMDeviceWimaxClass;
-GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
 NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
+const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
+guint               nm_device_wimax_get_center_frequency
+                                                        (NMDeviceWimax *self);
+gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
+const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
 NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
                                                          const char *path);
 const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);
-guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);
 gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);
-gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
 gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);
-const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
+GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
+                                                         const char *path);
@@ -103,104 +103,99 @@ const char *

Details

-

NM_DEVICE_WIMAX_HW_ADDRESS

-
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
-
+

NMDeviceWimax

+
typedef struct _NMDeviceWimax NMDeviceWimax;

-

NM_DEVICE_WIMAX_ACTIVE_NSP

-
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+
NMDeviceWimaxClass

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

NM_DEVICE_WIMAX_CENTER_FREQUENCY

-
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+
NM_DEVICE_WIMAX_ACTIVE_NSP

+
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
-

NM_DEVICE_WIMAX_RSSI

-
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+
NM_DEVICE_WIMAX_BSID

+
#define NM_DEVICE_WIMAX_BSID             "bsid"
-

NM_DEVICE_WIMAX_CINR

-
#define NM_DEVICE_WIMAX_CINR             "cinr"
+
NM_DEVICE_WIMAX_CENTER_FREQUENCY

+
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
-

NM_DEVICE_WIMAX_TX_POWER

-
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
+
NM_DEVICE_WIMAX_CINR

+
#define NM_DEVICE_WIMAX_CINR             "cinr"
-

NM_DEVICE_WIMAX_BSID

-
#define NM_DEVICE_WIMAX_BSID             "bsid"
+
NM_DEVICE_WIMAX_HW_ADDRESS

+
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
-

NMDeviceWimax

-
typedef struct _NMDeviceWimax NMDeviceWimax;
+

NM_DEVICE_WIMAX_RSSI

+
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+

-

NMDeviceWimaxClass

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

+
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
-

nm_device_wimax_new ()

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

nm_device_wimax_get_active_nsp ()

+
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

-Creates a new NMDeviceWimax. +Gets the active NMWimaxNsp.

- - + - - - - - @@ -208,84 +203,81 @@ Creates a new
-

nm_device_wimax_get_hw_address ()

-
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
+

nm_device_wimax_get_bsid ()

+
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

-Gets the hardware (MAC) address of the NMDeviceWimax +Gets the ID of the serving Base Station when the device is connected.

connection :

the DBusGConnection +

wimax :

a NMDeviceWimax

path :

the D-Bus object path of the WiMAX device

Returns :

a new WiMAX device. [transfer full] +the access point or NULL if none is active. [transfer full]
- + - +

wimax :

self :

 a NMDeviceWimax

Returns :

the hardware address. This is the internal string used by the -device, and must not be modified.the ID of the serving Base Station, or NULL
-

nm_device_wimax_get_active_nsp ()

-
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
+

nm_device_wimax_get_center_frequency ()

+
guint               nm_device_wimax_get_center_frequency
+                                                        (NMDeviceWimax *self);

-Gets the active NMWimaxNsp. +Gets the center frequency (in KHz) of the radio channel the device is using +to communicate with the network when connected. Has no meaning when the +device is not connected.

- + - +

wimax :

self :

 a NMDeviceWimax

Returns :

the access point or NULL if none is active. [transfer full] -the center frequency in KHz, or 0
-

nm_device_wimax_get_nsp_by_path ()

-
NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
-                                                         const char *path);
+

nm_device_wimax_get_cinr ()

+
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);

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

- + - - - - - +

wimax :

self :

 a NMDeviceWimax

path :

the object path of the NSP

Returns :

the access point or NULL if none is found. [transfer none] -the CINR in dB, or 0
-

nm_device_wimax_get_nsps ()

-
const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);
+

nm_device_wimax_get_hw_address ()

+
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

-Gets all the scanned NSPs of the NMDeviceWimax. +Gets the hardware (MAC) address of the NMDeviceWimax

@@ -297,72 +289,74 @@ Gets all the scanned NSPs of the - +

Returns :

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

nm_device_wimax_get_center_frequency ()

-
guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);
+

nm_device_wimax_get_nsp_by_path ()

+
NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
+                                                         const char *path);

-Gets the center frequency (in KHz) of the radio channel the device is using -to communicate with the network when connected. Has no meaning when the -device is not connected. +Gets a NMWimaxNsp by path.

- + + + + + - +

self :

wimax :

 a NMDeviceWimax

path :

the object path of the NSP

Returns :

the center frequency in KHz, or 0the access point or NULL if none is found. [transfer none] +
-

nm_device_wimax_get_rssi ()

-
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);
+

nm_device_wimax_get_nsps ()

+
const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);

-Gets the RSSI of the current radio link in dBm. This value indicates how -strong the raw received RF signal from the base station is, but does not -indicate the overall quality of the radio link. Has no meaning when the -device is not connected. +Gets all the scanned NSPs of the NMDeviceWimax.

- + - +

self :

wimax :

 a NMDeviceWimax

Returns :

the RSSI in dBm, or 0a GPtrArray containing +all the scanned NMWimaxNsps. +The returned array is owned by the client and should not be modified. [element-type NMClient.WimaxNsp] +
-

nm_device_wimax_get_cinr ()

-
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
+

nm_device_wimax_get_rssi ()

+
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);

-Gets the CINR (Carrier to Interference + Noise Ratio) of the current radio -link in dB. CINR is a more accurate measure of radio link quality. Has no -meaning when the device is not connected. +Gets the RSSI of the current radio link in dBm. This value indicates how +strong the raw received RF signal from the base station is, but does not +indicate the overall quality of the radio link. Has no meaning when the +device is not connected.

@@ -374,7 +368,7 @@ meaning when the device is not connected. - +

Returns :

the CINR in dB, or 0the RSSI in dBm, or 0
@@ -405,22 +399,28 @@ Average power of the last burst transmitted by the device, in units of
-

nm_device_wimax_get_bsid ()

-
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
+

nm_device_wimax_new ()

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

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

- - + + + + + - +

self :

a NMDeviceWimax +

connection :

the DBusGConnection

path :

the D-Bus object path of the WiMAX device

Returns :

the ID of the serving Base Station, or NULLa new WiMAX device. [transfer full] +
@@ -559,6 +559,6 @@ Notifies that a
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html index 1990b6cb..67a8f4fd 100644 --- a/docs/libnm-glib/html/NMIP4Config.html +++ b/docs/libnm-glib/html/NMIP4Config.html @@ -8,7 +8,7 @@ - + @@ -44,17 +44,17 @@ 
                    NMIP4Config;
                     NMIP4ConfigClass;
 #define             NM_IP4_CONFIG_ADDRESSES
-#define             NM_IP4_CONFIG_NAMESERVERS
 #define             NM_IP4_CONFIG_DOMAINS
+#define             NM_IP4_CONFIG_NAMESERVERS
 #define             NM_IP4_CONFIG_ROUTES
 #define             NM_IP4_CONFIG_WINS_SERVERS
-GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
 const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);
-const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);
 const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);
+const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);
 const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);
 const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);
+GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);
@@ -116,16 +116,16 @@ const -

NM_IP4_CONFIG_NAMESERVERS

-
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
+
NM_IP4_CONFIG_DOMAINS

+
#define NM_IP4_CONFIG_DOMAINS "domains"
-

NM_IP4_CONFIG_DOMAINS

-
#define NM_IP4_CONFIG_DOMAINS "domains"
+
NM_IP4_CONFIG_NAMESERVERS

+
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 

 

 

@@ -148,27 +148,23 @@ const 
-
nm_ip4_config_new ()

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

+
nm_ip4_config_get_addresses ()

+
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

 

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

 

-
-
+
-
-
-
-
-
@@ -176,10 +172,10 @@ Creates a new 
 

 

-
nm_ip4_config_get_addresses ()

-
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

+
nm_ip4_config_get_domains ()

+
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

 

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

 

 
 
 
connection :
the DBusGConnection
+
config :
a NMIP4Config
 
 

 
object_path :
the DBus object path of the device

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

 
@@ -191,8 +187,8 @@ Gets the IP4 addresses (containing the address, prefix, and gateway).
 
-
@@ -224,10 +220,10 @@ configuration and must not be modified. [
 

 

-
nm_ip4_config_get_domains ()

-
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

+
nm_ip4_config_get_routes ()

+
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

 

-Gets the domain names.
+Gets the routes.
 

 

 

 

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

 
@@ -239,8 +235,9 @@ Gets the domain names.
 
-
@@ -248,10 +245,10 @@ internal copy used by the configuration, and must not be modified. 
-
nm_ip4_config_get_routes ()

-
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

+
nm_ip4_config_get_wins_servers ()

+
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

 

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

 

 

 

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

 
@@ -263,9 +260,8 @@ Gets the routes.
 
-
@@ -273,23 +269,27 @@ and must not be modified. [
-
nm_ip4_config_get_wins_servers ()

-
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

+
nm_ip4_config_new ()

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

 

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

 

 

 

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

 

-
-
+
+
+
+
+
-
@@ -341,6 +341,6 @@ The 
 

-          Generated by GTK-Doc V1.17
+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 1d2b58e1..36385aad 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -44,15 +44,15 @@
 
                    NMIP6Config;
                     NMIP6ConfigClass;
 #define             NM_IP6_CONFIG_ADDRESSES
-#define             NM_IP6_CONFIG_NAMESERVERS
 #define             NM_IP6_CONFIG_DOMAINS
+#define             NM_IP6_CONFIG_NAMESERVERS
 #define             NM_IP6_CONFIG_ROUTES
-GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
 const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);
-const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);
 const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);
+const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);
 const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);
+GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
+                                                         const char *object_path);
 

@@ -113,16 +113,16 @@ const 
-
NM_IP6_CONFIG_NAMESERVERS

-
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
+
NM_IP6_CONFIG_DOMAINS

+
#define NM_IP6_CONFIG_DOMAINS "domains"
 

 

 

 

-
NM_IP6_CONFIG_DOMAINS

-
#define NM_IP6_CONFIG_DOMAINS "domains"
+
NM_IP6_CONFIG_NAMESERVERS

+
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 

 

 

@@ -137,27 +137,24 @@ const 
-
nm_ip6_config_new ()

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

+
nm_ip6_config_get_addresses ()

+
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

 

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

 

 
 
 
config :
a NMIP4Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

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

 
 
 
 
 

-
-
+
-
-
-
-
-
@@ -165,10 +162,10 @@ Creates a new 
 

 

-
nm_ip6_config_get_addresses ()

-
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

+
nm_ip6_config_get_domains ()

+
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

 

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

 

 
 
 
connection :
the DBusGConnection
+
config :
a NMIP6Config
 
 

 
object_path :
the DBus object path of the device

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

 
@@ -180,9 +177,8 @@ Gets the IP6 addresses (containing the address, prefix, and gateway).
 
-
@@ -215,10 +211,10 @@ This is the internal copy used by the configuration and must not be modified. 
 

 

-
nm_ip6_config_get_domains ()

-
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

+
nm_ip6_config_get_routes ()

+
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

 

-Gets the domain names.
+Gets the routes.
 

 

 

 

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

 
@@ -230,8 +226,9 @@ Gets the domain names.
 
 
-
@@ -239,24 +236,27 @@ This is the internal copy used by the configuration, and must not be modified. <
 
 

 

-
nm_ip6_config_get_routes ()

-
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

+
nm_ip6_config_new ()

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

 

-Gets the routes.
+Creates a new NMIP6Config.
 

 

 


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

 

-
-
+
+
+
+
+
-
@@ -305,6 +305,6 @@ The 
 

-          Generated by GTK-Doc V1.17
+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index b0910235..c336d432 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,10 +41,10 @@
 

 
 
 
config :
a NMIP6Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

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

 

 

 
Synopsis

-
#define             NM_OBJECT_DBUS_CONNECTION
-#define             NM_OBJECT_DBUS_PATH
-                    NMObject;
+
                    NMObject;
                     NMObjectClass;
+#define             NM_OBJECT_DBUS_CONNECTION
+#define             NM_OBJECT_DBUS_PATH
 DBusGConnection *   nm_object_get_connection            (NMObject *object);
 const char *        nm_object_get_path                  (NMObject *object);
 

@@ -80,22 +80,6 @@ const char *        
 
Details

 

-
NM_OBJECT_DBUS_CONNECTION

-
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
-

-

-

-

-

-

-
NM_OBJECT_DBUS_PATH

-
#define NM_OBJECT_DBUS_PATH "dbus-path"
-

-

-

-

-

-

 
NMObject

 
typedef struct _NMObject NMObject;

 

@@ -121,6 +105,22 @@ const char *        
+
NM_OBJECT_DBUS_CONNECTION

+
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
+

+

+

+

+

+

+
NM_OBJECT_DBUS_PATH

+
#define NM_OBJECT_DBUS_PATH "dbus-path"
+

+

+

+

+

+

 
nm_object_get_connection ()

 
DBusGConnection *   nm_object_get_connection            (NMObject *object);

 

@@ -184,6 +184,6 @@ device, and must not be modified.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index bbdd59fd..a674fe2f 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,9 +43,7 @@

Synopsis

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

Details

-

NM_REMOTE_CONNECTION_UPDATED

-
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
-
-

-

-
-
-
-

NM_REMOTE_CONNECTION_REMOVED

-
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
-
-

-

-
-
-

NMRemoteConnection

typedef struct _NMRemoteConnection NMRemoteConnection;

@@ -177,29 +161,19 @@

-

nm_remote_connection_new ()

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

NM_REMOTE_CONNECTION_REMOVED

+
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+
+

+

+
+
+
+

NM_REMOTE_CONNECTION_UPDATED

+
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
+

-Creates a new object representing the remote connection.

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

bus :

a valid and connected D-Bus connection

path :

the D-Bus path of the connection as exported by the settings service

Returns :

the new remote connection object on success, or NULL on failure
@@ -222,7 +196,7 @@ save them in the settings service.

callback :

a function to be called when the -commit completes. [scope async][allow none] +commit completes. [scope async][allow-none] @@ -299,6 +273,32 @@ must not be NULL. [ +

nm_remote_connection_new ()

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

+Creates a new object representing the remote connection. +

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

bus :

a valid and connected D-Bus connection

path :

the D-Bus path of the connection as exported by the settings service

Returns :

the new remote connection object on success, or NULL on failure
+

Property Details

@@ -391,6 +391,6 @@ still visible to the user.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index 09f803ff..558cec46 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -8,7 +8,7 @@ - + @@ -43,39 +43,36 @@

Synopsis

-
enum                NMRemoteSettingsError;
-#define             NM_TYPE_REMOTE_SETTINGS_ERROR
-#define             NM_REMOTE_SETTINGS_ERROR
-GQuark              nm_remote_settings_error_quark      (void);
-#define             NM_REMOTE_SETTINGS_BUS
-#define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
-#define             NM_REMOTE_SETTINGS_HOSTNAME
-#define             NM_REMOTE_SETTINGS_CAN_MODIFY
-#define             NM_REMOTE_SETTINGS_NEW_CONNECTION
-#define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
+
struct              NMRemoteSettings;
 void                (*NMRemoteSettingsAddConnectionFunc)
                                                         (NMRemoteSettings *settings,
                                                          NMRemoteConnection *connection,
                                                          GError *error,
                                                          gpointer user_data);
+struct              NMRemoteSettingsClass;
+enum                NMRemoteSettingsError;
 void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
                                                          GError *error,
                                                          gpointer user_data);
-struct              NMRemoteSettings;
-struct              NMRemoteSettingsClass;
-GType               nm_remote_settings_get_type         (void);
-NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
-GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
-NMRemoteConnection *  nm_remote_settings_get_connection_by_path
+#define             NM_REMOTE_SETTINGS_BUS
+#define             NM_REMOTE_SETTINGS_CAN_MODIFY
+#define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
+#define             NM_REMOTE_SETTINGS_HOSTNAME
+#define             NM_REMOTE_SETTINGS_NEW_CONNECTION
+#define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
+gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
+                                                         NMConnection *connection,
+                                                         NMRemoteSettingsAddConnectionFunc callback,
+                                                         gpointer user_data);
+GQuark              nm_remote_settings_error_quark      (void);
+NMRemoteConnection * nm_remote_settings_get_connection_by_path
                                                         (NMRemoteSettings *settings,
                                                          const char *path);
 NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
                                                         (NMRemoteSettings *settings,
                                                          const char *uuid);
-gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
-                                                         NMRemoteSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);
+GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
+NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
 gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
                                                          const char *hostname,
                                                          NMRemoteSettingsSaveHostnameFunc callback,
@@ -113,6 +110,48 @@ struct              
 
Details

 

+
struct NMRemoteSettings

+
struct NMRemoteSettings;

+

+

+

+

+

+
NMRemoteSettingsAddConnectionFunc ()

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

+

+

+

+

+

+
struct NMRemoteSettingsClass

+
struct NMRemoteSettingsClass {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*new_connection) (NMRemoteSettings *settings,
+	                        NMRemoteConnection *connection);
+
+	void (*connections_read) (NMRemoteSettings *settings);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
+

+

+

+

+

+

 
enum NMRemoteSettingsError

 
typedef enum {
 	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
@@ -148,34 +187,12 @@ Describes errors that may result from operations involving a 
 

 

-
NM_TYPE_REMOTE_SETTINGS_ERROR

-
#define NM_TYPE_REMOTE_SETTINGS_ERROR (nm_remote_settings_error_get_type ()) 
-

-

-

-

-

-

-
NM_REMOTE_SETTINGS_ERROR

-
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
-

-

-

-

-

-

-
nm_remote_settings_error_quark ()

-
GQuark              nm_remote_settings_error_quark      (void);

+
NMRemoteSettingsSaveHostnameFunc ()

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

 

-Registers an error quark for NMRemoteSettings if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMRemoteSettings errors.

 

 

 

@@ -187,24 +204,24 @@ Registers an error quark for 
 

 

-
NM_REMOTE_SETTINGS_SERVICE_RUNNING

-
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+
NM_REMOTE_SETTINGS_CAN_MODIFY

+
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
 

 

 

 

 

 

-
NM_REMOTE_SETTINGS_HOSTNAME

-
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+
NM_REMOTE_SETTINGS_CONNECTIONS_READ

+
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
 

 

 

 

 

 

-
NM_REMOTE_SETTINGS_CAN_MODIFY

-
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
+
NM_REMOTE_SETTINGS_HOSTNAME

+
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
 

 

 

@@ -219,121 +236,72 @@ Registers an error quark for 
 

 

-
NM_REMOTE_SETTINGS_CONNECTIONS_READ

-
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
+
NM_REMOTE_SETTINGS_SERVICE_RUNNING

+
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
 

 

 

 

 

 

-
NMRemoteSettingsAddConnectionFunc ()

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

-

-

-

-

-

-
NMRemoteSettingsSaveHostnameFunc ()

-
void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                                         GError *error,
+
nm_remote_settings_add_connection ()

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

 

-

-

-

-

-
struct NMRemoteSettings

-
struct NMRemoteSettings;

-

-

-

-

-

-
struct NMRemoteSettingsClass

-
struct NMRemoteSettingsClass {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*new_connection) (NMRemoteSettings *settings,
-	                        NMRemoteConnection *connection);
-
-	void (*connections_read) (NMRemoteSettings *settings);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-

-

-

-

-

-

-
nm_remote_settings_get_type ()

-
GType               nm_remote_settings_get_type         (void);

-

-

-

-

-

-
nm_remote_settings_new ()

-
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

-

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

 

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

 
 
 
bus :
a valid and connected D-Bus connection. [allow-none]
+
settings :
the NMRemoteSettings
+
connection :
the connection to add. Note that this object's settings will be
+added, not the object itself
callback :
callback to be called when the add operation completes. [scope async]
+
user_data :
caller-specific data passed to callback. [closure]
 
 

 

 
Returns :
the new remote settings object on success, or NULL on failureTRUE if the request was successful, FALSE if it failed
 

 
 

 

 

 

-
nm_remote_settings_list_connections ()

-
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

+
nm_remote_settings_error_quark ()

+
GQuark              nm_remote_settings_error_quark      (void);

+

+Registers an error quark for NMRemoteSettings if necessary.
+

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

 

settings :
the NMRemoteSettings
-

 
Returns :
a
-list containing all connections provided by the remote settings service.
-Each element of the returned list is a NMRemoteConnection instance, which is
-owned by the NMRemoteSettings object and should not be freed by the caller.
-The returned list is, however, owned by the caller and should be freed
-using g_slist_free() when no longer required. [transfer container][element-type NMClient.RemoteConnection]
-
the error quark used for NMRemoteSettings errors.

 

 

 

 

 
nm_remote_settings_get_connection_by_path ()

-
NMRemoteConnection *  nm_remote_settings_get_connection_by_path
+
NMRemoteConnection * nm_remote_settings_get_connection_by_path
                                                         (NMRemoteSettings *settings,
                                                          const char *path);

 

@@ -392,15 +360,8 @@ not known. [
-
nm_remote_settings_add_connection ()

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

-

-Requests that the remote settings service add the given settings to a new
-connection.
-

+
nm_remote_settings_list_connections ()

+
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

 

@@ -410,23 +371,36 @@ connection.
 
-
-
-
-
-
-
+
+
+

 
 
 
 
connection :
the connection to add. Note that this object's settings will be
-added, not the object itself
callback :
callback to be called when the add operation completes. [scope async]
+
Returns :
a
+list containing all connections provided by the remote settings service.
+Each element of the returned list is a NMRemoteConnection instance, which is
+owned by the NMRemoteSettings object and should not be freed by the caller.
+The returned list is, however, owned by the caller and should be freed
+using g_slist_free() when no longer required. [transfer container][element-type NMClient.RemoteConnection]
 
 

+

+

+

+
nm_remote_settings_new ()

+
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

+

+Creates a new object representing the remote settings service.
+

+

++
-
-
+
-
+


 
user_data :
caller-specific data passed to callback. [closure]
+
bus :
a valid and connected D-Bus connection. [allow-none]
 
 

 

 
Returns :
TRUE if the request was successful, FALSE if it failedthe new remote settings object on success, or NULL on failure
 

 
 

@@ -458,7 +432,7 @@ persistent hostname
 
 
callback :

 callback to be called when the
-hostname operation completes. [scope async][allow none]
+hostname operation completes. [scope async][allow-none]
 
 
 
@@ -551,6 +525,6 @@ hostname operation completes. [
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index ff6be0da..c080405b 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,15 +43,14 @@
 

 

 
Synopsis

-
#define             NM_SECRET_AGENT_ERROR
-#define             NM_TYPE_SECRET_AGENT_ERROR
-GQuark              nm_secret_agent_error_quark         (void);
+
                    NMSecretAgent;
+                    NMSecretAgentClass;
+void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);
 enum                NMSecretAgentError;
 enum                NMSecretAgentGetSecretsFlags;
-#define             NM_SECRET_AGENT_IDENTIFIER
-#define             NM_SECRET_AGENT_AUTO_REGISTER
-#define             NM_SECRET_AGENT_REGISTRATION_RESULT
-                    NMSecretAgent;
 void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
                                                          NMConnection *connection,
                                                          GHashTable *secrets,
@@ -61,14 +60,14 @@ enum                NMConnection *connection,
                                                          GError *error,
                                                          gpointer user_data);
-void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+#define             NM_SECRET_AGENT_AUTO_REGISTER
+#define             NM_SECRET_AGENT_IDENTIFIER
+#define             NM_SECRET_AGENT_REGISTRATION_RESULT
+void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
                                                          NMConnection *connection,
-                                                         GError *error,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
                                                          gpointer user_data);
-                    NMSecretAgentClass;
-GType               nm_secret_agent_get_type            (void);
-gboolean            nm_secret_agent_register            (NMSecretAgent *self);
-gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
+GQuark              nm_secret_agent_error_quark         (void);
 void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          const char *setting_name,
@@ -76,14 +75,12 @@ enum                NMSecretAgentGetSecretsFlags flags,
                                                          NMSecretAgentGetSecretsFunc callback,
                                                          gpointer user_data);
+gboolean            nm_secret_agent_register            (NMSecretAgent *self);
 void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          NMSecretAgentSaveSecretsFunc callback,
                                                          gpointer user_data);
-void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);
+gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
 

 

 

@@ -114,24 +111,91 @@ enum                
 
Details

 

-
NM_SECRET_AGENT_ERROR

-
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-

+
NMSecretAgent

+
typedef struct _NMSecretAgent NMSecretAgent;

 

 

 

 

 

-
NM_TYPE_SECRET_AGENT_ERROR

-
#define NM_TYPE_SECRET_AGENT_ERROR    (nm_secret_agent_error_get_type ())
+
NMSecretAgentClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual methods for subclasses */
+
+	/* Called when the subclass should retrieve and return secrets.  Subclass
+	 * must copy or reference any arguments it may require after returning from
+	 * this method, as the arguments will freed (except for 'agent', 'callback',
+	 * and 'user_data' of course).  If the request is canceled, the callback
+	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error.
+	 */
+	void (*get_secrets) (NMSecretAgent *agent,
+	                     NMConnection *connection,
+	                     const char *connection_path,
+	                     const char *setting_name,
+	                     const char **hints,
+	                     NMSecretAgentGetSecretsFlags flags,
+	                     NMSecretAgentGetSecretsFunc callback,
+	                     gpointer user_data);
+
+	/* Called when the subclass should cancel an outstanding request to
+	 * get secrets for a given connection.  Canceling the request MUST
+	 * call the callback that was passed along with the initial get_secrets
+	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error to that callback.
+	 */
+	void (*cancel_get_secrets) (NMSecretAgent *agent,
+	                            const char *connection_path,
+	                            const char *setting_name);
+
+	/* Called when the subclass should save the secrets contained in the
+	 * connection to backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*save_secrets) (NMSecretAgent *agent,
+	                      NMConnection *connection,
+	                      const char *connection_path,
+	                      NMSecretAgentSaveSecretsFunc callback,
+	                      gpointer user_data);
+
+	/* Called when the subclass should delete the secrets contained in the
+	 * connection from backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'agent', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*delete_secrets) (NMSecretAgent *agent,
+	                        NMConnection *connection,
+	                        const char *connection_path,
+	                        NMSecretAgentDeleteSecretsFunc callback,
+	                        gpointer user_data);
+
+	/* Signals */
+	void (*registration_result) (NMSecretAgent *agent, GError *error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMSecretAgentClass;
 

 

 

 

 

 

-
nm_secret_agent_error_quark ()

-
GQuark              nm_secret_agent_error_quark         (void);

+
NMSecretAgentDeleteSecretsFunc ()

+
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
+                                                         NMConnection *connection,
+                                                         GError *error,
+                                                         gpointer user_data);

 

 

 

@@ -192,37 +256,6 @@ is allowed.
 

 

 

-
NM_SECRET_AGENT_IDENTIFIER

-
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
-

-

-

-

-

-

-
NM_SECRET_AGENT_AUTO_REGISTER

-
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
-

-

-

-

-

-

-
NM_SECRET_AGENT_REGISTRATION_RESULT

-
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
-

-

-

-

-

-

-
NMSecretAgent

-
typedef struct _NMSecretAgent NMSecretAgent;

-

-

-

-

-

 
NMSecretAgentGetSecretsFunc ()

 
void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
                                                          NMConnection *connection,
@@ -244,104 +277,41 @@ is allowed.
 

 

 

-
NMSecretAgentDeleteSecretsFunc ()

-
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NM_SECRET_AGENT_AUTO_REGISTER

+
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
+

 

 

 

 

 

-
NMSecretAgentClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual methods for subclasses */
-
-	/* Called when the subclass should retrieve and return secrets.  Subclass
-	 * must copy or reference any arguments it may require after returning from
-	 * this method, as the arguments will freed (except for 'agent', 'callback',
-	 * and 'user_data' of course).  If the request is canceled, the callback
-	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
-	 * error.
-	 */
-	void (*get_secrets) (NMSecretAgent *agent,
-	                     NMConnection *connection,
-	                     const char *connection_path,
-	                     const char *setting_name,
-	                     const char **hints,
-	                     NMSecretAgentGetSecretsFlags flags,
-	                     NMSecretAgentGetSecretsFunc callback,
-	                     gpointer user_data);
-
-	/* Called when the subclass should cancel an outstanding request to
-	 * get secrets for a given connection.  Canceling the request MUST
-	 * call the callback that was passed along with the initial get_secrets
-	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
-	 * error to that callback.
-	 */
-	void (*cancel_get_secrets) (NMSecretAgent *agent,
-	                            const char *connection_path,
-	                            const char *setting_name);
-
-	/* Called when the subclass should save the secrets contained in the
-	 * connection to backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'agent', 'callback', and 'user_data'
-	 * of course).
-	 */
-	void (*save_secrets) (NMSecretAgent *agent,
-	                      NMConnection *connection,
-	                      const char *connection_path,
-	                      NMSecretAgentSaveSecretsFunc callback,
-	                      gpointer user_data);
-
-	/* Called when the subclass should delete the secrets contained in the
-	 * connection from backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'agent', 'callback', and 'user_data'
-	 * of course).
-	 */
-	void (*delete_secrets) (NMSecretAgent *agent,
-	                        NMConnection *connection,
-	                        const char *connection_path,
-	                        NMSecretAgentDeleteSecretsFunc callback,
-	                        gpointer user_data);
-
-	/* Signals */
-	void (*registration_result) (NMSecretAgent *agent, GError *error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSecretAgentClass;
+
NM_SECRET_AGENT_IDENTIFIER

+
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
 

 

 

 

 

 

-
nm_secret_agent_get_type ()

-
GType               nm_secret_agent_get_type            (void);

+
NM_SECRET_AGENT_REGISTRATION_RESULT

+
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+

 

 

 

 

 

-
nm_secret_agent_register ()

-
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

+
nm_secret_agent_delete_secrets ()

+
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer user_data);

 

-Registers the NMSecretAgent with the NetworkManager secret manager,
-indicating to NetworkManager that the agent is able to provide and save
-secrets for connections on behalf of its user.  Registration is an
-asynchronous operation and its success or failure is indicated via the
-'registration-result' signal.
+Asynchronously ask the agent to delete all saved secrets belonging to
+connection.
+

+

+VFunc: delete_secrets
 

 
@@ -352,40 +322,32 @@ asynchronous operation and its success or failure is indicated via the
 
-
-
+
+
-
-

 

 
 
Returns :
a new TRUE if registration was successfully requested (this does
-not mean registration itself was successful), FALSE if registration was not
-successfully requested.
connection :
a NMConnection
+
 

-

-

-

-
nm_secret_agent_unregister ()

-
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

-

-Unregisters the NMSecretAgent with the NetworkManager secret manager,
-indicating to NetworkManager that the agent is will no longer provide or
-store secrets on behalf of this user.
-

-

--
-
-
+
-
-
+
+


 
self :
a NMSecretAgent
+
callback :
a callback, invoked when the operation is done. [scope async]
 
 

 
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.
user_data :
caller-specific data to be passed to callback. [closure]
+
 

 
 

 

 

 

+
nm_secret_agent_error_quark ()

+
GQuark              nm_secret_agent_error_quark         (void);

+

+

+

+

+

 
nm_secret_agent_get_secrets ()

 
void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
                                                          NMConnection *connection,
@@ -444,6 +406,34 @@ VFunc: get_secrets
 

 

 

+
nm_secret_agent_register ()

+
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

+

+Registers the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is able to provide and save
+secrets for connections on behalf of its user.  Registration is an
+asynchronous operation and its success or failure is indicated via the
+'registration-result' signal.
+

+

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


self :
a NMSecretAgent
+
Returns :
a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
+successfully requested.

+

+

+

 
nm_secret_agent_save_secrets ()

 
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
@@ -484,17 +474,12 @@ VFunc: save_secrets
 

 

 

-
nm_secret_agent_delete_secrets ()

-
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);

-

-Asynchronously ask the agent to delete all saved secrets belonging to
-connection.
-

+
nm_secret_agent_unregister ()

+
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

 

-VFunc: delete_secrets
+Unregisters the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is will no longer provide or
+store secrets on behalf of this user.
 

 
@@ -505,19 +490,8 @@ VFunc: delete_secrets
 
-
-
-
-
-
-
-
-
-
-
+
+

 

 
 
connection :
a NMConnection
-
callback :
a callback, invoked when the operation is done. [scope async]
-
user_data :
caller-specific data to be passed to callback. [closure]
-
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.
 

 
 

@@ -588,6 +562,6 @@ request was successful.
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 3f547734..852ec461 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,14 +43,14 @@

Synopsis

-
#define             NM_VPN_CONNECTION_VPN_STATE
-#define             NM_VPN_CONNECTION_BANNER
-                    NMVPNConnection;
+
                    NMVPNConnection;
                     NMVPNConnectionClass;
+#define             NM_VPN_CONNECTION_BANNER
+#define             NM_VPN_CONNECTION_VPN_STATE
+const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
+NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
 GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
                                                          const char *path);
-NMVPNConnectionState  nm_vpn_connection_get_vpn_state   (NMVPNConnection *vpn);
-const char *           nm_vpn_connection_get_banner     (NMVPNConnection *vpn);
@@ -83,22 +83,6 @@ const char *

Details

-

NM_VPN_CONNECTION_VPN_STATE

-
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
-
-

-

-
-
-
-

NM_VPN_CONNECTION_BANNER

-
#define NM_VPN_CONNECTION_BANNER "banner"
-
-

-

-
-
-

NMVPNConnection

typedef struct _NMVPNConnection NMVPNConnection;

@@ -129,6 +113,36 @@ const char * +

NM_VPN_CONNECTION_BANNER

+
#define NM_VPN_CONNECTION_BANNER "banner"
+
+

+

+
+
+
+

NM_VPN_CONNECTION_VPN_STATE

+
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
+
+

+

+
+
+
+

nm_vpn_connection_get_banner ()

+
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
+

+

+
+
+
+

nm_vpn_connection_get_vpn_state ()

+
NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
+

+

+
+
+

nm_vpn_connection_new ()

GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
                                                          const char *path);
@@ -155,20 +169,6 @@ Creates a new -

nm_vpn_connection_get_vpn_state ()

-
NMVPNConnectionState  nm_vpn_connection_get_vpn_state   (NMVPNConnection *vpn);
-

-

-
-
-
-

nm_vpn_connection_get_banner ()

-
const char *           nm_vpn_connection_get_banner     (NMVPNConnection *vpn);
-

-

-

Property Details

@@ -219,6 +219,6 @@ The VPN state of the active VPN connection.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index dfff7ffd..aa69342a 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -8,7 +8,7 @@ - + @@ -41,21 +41,21 @@

Synopsis

-
#define             NM_WIMAX_NSP_NAME
-#define             NM_WIMAX_NSP_SIGNAL_QUALITY
-#define             NM_WIMAX_NSP_NETWORK_TYPE
-enum                NMWimaxNspNetworkType;
-                    NMWimaxNsp;
+
                    NMWimaxNsp;
                     NMWimaxNspClass;
-GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
-guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
-NMWimaxNspNetworkType  nm_wimax_nsp_get_network_type    (NMWimaxNsp *nsp);
-GSList *                nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
+enum                NMWimaxNspNetworkType;
+#define             NM_WIMAX_NSP_NAME
+#define             NM_WIMAX_NSP_NETWORK_TYPE
+#define             NM_WIMAX_NSP_SIGNAL_QUALITY
 gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
                                                          NMConnection *connection);
+GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
+                                                         const GSList *connections);
+const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
+NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
+guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
+                                                         const char *path);
@@ -82,24 +82,25 @@ const char *

Details

-

NM_WIMAX_NSP_NAME

-
#define NM_WIMAX_NSP_NAME           "name"
-
-

-

-
-
-
-

NM_WIMAX_NSP_SIGNAL_QUALITY

-
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
-
+

NMWimaxNsp

+
typedef struct _NMWimaxNsp NMWimaxNsp;

-

NM_WIMAX_NSP_NETWORK_TYPE

-
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
+
NMWimaxNspClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMWimaxNspClass;
 

 

 

@@ -119,52 +120,66 @@ const char *        
-
NMWimaxNsp

-
typedef struct _NMWimaxNsp NMWimaxNsp;

+
NM_WIMAX_NSP_NAME

+
#define NM_WIMAX_NSP_NAME           "name"
+
-

NMWimaxNspClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMWimaxNspClass;
+
NM_WIMAX_NSP_NETWORK_TYPE

+
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
-

nm_wimax_nsp_new ()

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

NM_WIMAX_NSP_SIGNAL_QUALITY

+
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+
+

+

+
+
+
+

nm_wimax_nsp_connection_valid ()

+
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);

-Creates a new NMWimaxNsp. +

+
+
+
+

nm_wimax_nsp_filter_connections ()

+
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
+                                                         const GSList *connections);
+

+Filters a given list of connections for a given NMWimaxNsp object and +return connections which may be activated with the access point. Any +returned connections will match the nsp's network name and other attributes.

- - + + - - + + - @@ -194,10 +209,10 @@ Gets the name of the wimax NSP
-

nm_wimax_nsp_get_signal_quality ()

-
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+

nm_wimax_nsp_get_network_type ()

+
NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);

-Gets the WPA signal quality of the wimax NSP. +Gets the network type of the wimax NSP.

connection :

the DBusGConnection -

nsp :

an NMWimaxNsp to filter connections for

path :

the D-Bus object path of the WiMAX NSP

connections :

a list of +NMConnection objects to filter. [element-type NetworkManager.Connection] +

Returns :

a new WiMAX NSP. [transfer full] +a +list of NMConnection objects that could be activated with the given nsp. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
@@ -209,17 +224,17 @@ Gets the WPA signal quality of the wimax NSP. - +

Returns :

the signal qualitythe network type
-

nm_wimax_nsp_get_network_type ()

-
NMWimaxNspNetworkType  nm_wimax_nsp_get_network_type    (NMWimaxNsp *nsp);
+

nm_wimax_nsp_get_signal_quality ()

+
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

-Gets the network type of the wimax NSP. +Gets the WPA signal quality of the wimax NSP.

@@ -231,54 +246,39 @@ Gets the network type of the wimax NSP. - +

Returns :

the network typethe signal quality
-

nm_wimax_nsp_filter_connections ()

-
GSList *                nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
+

nm_wimax_nsp_new ()

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

-Filters a given list of connections for a given NMWimaxNsp object and -return connections which may be activated with the access point. Any -returned connections will match the nsp's network name and other attributes. +Creates a new NMWimaxNsp.

- - + + - - + + -

nsp :

an NMWimaxNsp to filter connections for

connection :

the DBusGConnection +

connections :

a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] -

path :

the D-Bus object path of the WiMAX NSP

Returns :

a -list of NMConnection objects that could be activated with the given nsp. -The elements of the list are owned by their creator and should not be freed -by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] +a new WiMAX NSP. [transfer full]
-
-
-

nm_wimax_nsp_connection_valid ()

-
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
-

-

-

Property Details

@@ -313,6 +313,6 @@ The signal quality of the WiMAX NSP.
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html index 37e2673f..7555a67a 100644 --- a/docs/libnm-glib/html/annotation-glossary.html +++ b/docs/libnm-glib/html/annotation-glossary.html @@ -7,7 +7,7 @@ - + @@ -81,6 +81,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index adba6f39..28ab9214 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -37,10 +37,6 @@  |  S  |  - T -  |  - U -  |  V  |  W @@ -529,6 +525,10 @@ dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-sec
+dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue +
+
+
NMDevice, struct in NMDevice
@@ -1335,14 +1335,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-nm_ip6_address_array_get_type, function in nm-types -
-
-
-nm_ip6_address_object_array_get_type, function in nm-types -
-
-
NM_IP6_CONFIG_ADDRESSES, macro in NMIP6Config
@@ -1378,14 +1370,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue NM_IP6_CONFIG_ROUTES, macro in NMIP6Config
-
-nm_ip6_route_object_array_get_type, function in nm-types -
-
-
-NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi -
-

O

NMObject, struct in NMObject @@ -1404,10 +1388,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-nm_object_array_get_type, function in nm-types -
-
-
NM_OBJECT_DBUS_CONNECTION, macro in NMObject
@@ -1549,10 +1529,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-NM_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings -
-
-
nm_remote_settings_error_quark, function in NMRemoteSettings
@@ -1565,10 +1541,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-nm_remote_settings_get_type, function in NMRemoteSettings -
-
-
NM_REMOTE_SETTINGS_HOSTNAME, macro in NMRemoteSettings
@@ -1642,10 +1614,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-NM_SECRET_AGENT_ERROR, macro in NMSecretAgent -
-
-
nm_secret_agent_error_quark, function in NMSecretAgent
@@ -1654,10 +1622,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-nm_secret_agent_get_type, function in NMSecretAgent -
-
-
NM_SECRET_AGENT_IDENTIFIER, macro in NMSecretAgent
@@ -1677,64 +1641,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue nm_secret_agent_unregister, function in NMSecretAgent
-
-nm_ssid_get_type, function in nm-types -
-
-
-nm_string_array_get_type, function in nm-types -
-
-

T

-
-NM_TYPE_IP6_ADDRESS_ARRAY, macro in nm-types -
-
-
-NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY, macro in nm-types -
-
-
-NM_TYPE_IP6_ROUTE_OBJECT_ARRAY, macro in nm-types -
-
-
-NM_TYPE_OBJECT_ARRAY, macro in nm-types -
-
-
-NM_TYPE_REMOTE_SETTINGS_ERROR, macro in NMRemoteSettings -
-
-
-NM_TYPE_SECRET_AGENT_ERROR, macro in NMSecretAgent -
-
-
-NM_TYPE_SSID, macro in nm-types -
-
-
-NM_TYPE_STRING_ARRAY, macro in nm-types -
-
-
-NM_TYPE_UINT_ARRAY, macro in nm-types -
-
-
-NM_TYPE_VPN_PLUGIN_ERROR, macro in NMVPNPlugin -
-
-
-NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi -
-
-

U

-
-nm_uint_array_get_type, function in nm-types -
-

V

NMVPNConnection, struct in NMVPNConnection @@ -1769,19 +1675,19 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-NMVpnPluginUiFactory, user_function in NMVpnPluginUi +NMVpnPluginUiFactory, user_function in NMVpnPluginUiWidget
-NMVpnPluginUiInterface, struct in NMVpnPluginUi +NMVpnPluginUiInterface, struct in NMVpnPluginUiWidget
-NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUi +NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUiWidget
-NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUi +NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUiWidget
@@ -1813,14 +1719,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-NM_VPN_PLUGIN_ERROR, macro in NMVPNPlugin -
-
-
-nm_vpn_plugin_error_get_type, function in NMVPNPlugin -
-
-
nm_vpn_plugin_error_quark, function in NMVPNPlugin
@@ -1853,79 +1751,67 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT, macro in NMVpnPluginUi -
-
-
-NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT, macro in NMVpnPluginUi -
-
-
-NM_VPN_PLUGIN_UI_CAPABILITY_NONE, macro in NMVpnPluginUi -
-
-
-nm_vpn_plugin_ui_factory, function in NMVpnPluginUi +NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUi +NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT, macro in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_CAPABILITY_NONE, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUi +nm_vpn_plugin_ui_factory, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUi +nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUi +nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_WIDGET_INTERFACE, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_get_type, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUiWidget
@@ -2000,6 +1886,6 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 5ed579ad..ed4607b2 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@

-libnm-glib API Reference

+libnm-glib API Reference
NMClient @@ -87,7 +87,7 @@ NMVPNPlugin
-NMVpnPluginUi +NMVpnPluginUiWidget
nm-vpn-plugin-utils @@ -96,6 +96,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index c64038ed..70270f38 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -6,7 +6,7 @@ - + @@ -29,7 +29,7 @@

Copyright © 2011 The NetworkManager Authors

-

+

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

-NMVpnPluginUi +NMVpnPluginUiWidget
nm-vpn-plugin-utils @@ -141,6 +141,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index b12be4b2..3df60aeb 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -6,47 +6,47 @@ - - + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - + @@ -69,23 +69,23 @@ + + - - - - - - - + + + + - - - - + + + + + @@ -100,45 +100,45 @@ + + + + + - - - + + - - + - - + + + - + - - - - - - + + + + + - + + - - + - - - - + + + + - - - - + @@ -164,17 +164,17 @@ + + + - - - - + - + @@ -187,23 +187,23 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -220,12 +220,12 @@ - - - + + + @@ -235,15 +235,15 @@ - - - - + + + + - + @@ -255,25 +255,25 @@ - + + + - + + - - - - - + + + + - - - + @@ -291,18 +291,18 @@ - - - - - + + + + + + - - - + + @@ -313,31 +313,31 @@ - - - - + + + - + + + + - - - - - - - - + + + + - + + + + - - - + + @@ -358,16 +358,16 @@ - + - - + + @@ -383,14 +383,14 @@ - + - - + + @@ -405,9 +405,9 @@ - - + + @@ -419,9 +419,9 @@ - - + + @@ -430,10 +430,10 @@ - - + + @@ -446,17 +446,17 @@ - - - + + + @@ -471,29 +471,26 @@ + + + - - - + - - - - - - - - - - + + + + + - + + @@ -507,20 +504,6 @@ - - - - - - - - - - - - - - @@ -528,28 +511,25 @@ - - - + + + - - - - - - - - - + + + + + + - + @@ -562,13 +542,13 @@ - - - - + + + + @@ -578,57 +558,49 @@ - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html index 74a98981..d6ecdc55 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html +++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html @@ -7,8 +7,8 @@ - - + + @@ -18,7 +18,7 @@ Up Home libnm-glib Reference Manual -Next +Next Top @@ -37,27 +37,24 @@

Synopsis

-
#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
-#define             NM_VPN_PLUGIN_STATE
-enum                NMVPNPluginError;
-#define             NM_VPN_PLUGIN_ERROR
-#define             NM_TYPE_VPN_PLUGIN_ERROR
-                    NMVPNPlugin;
+
                    NMVPNPlugin;
                     NMVPNPluginClass;
+enum                NMVPNPluginError;
+#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+#define             NM_VPN_PLUGIN_STATE
+gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);
 GQuark              nm_vpn_plugin_error_quark           (void);
-GType               nm_vpn_plugin_error_get_type        (void);
-DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
-NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
-void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);
-void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);
 void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
                                                          NMVPNPluginFailure reason);
+DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
+NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
 void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip4_config);
-gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);
+void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);
+void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);
@@ -68,56 +65,6 @@ enum

Details

-

NM_VPN_PLUGIN_DBUS_SERVICE_NAME

-
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_STATE

-
#define NM_VPN_PLUGIN_STATE             "state"
-
-

-

-
-
-
-

enum NMVPNPluginError

-
typedef enum {
-	NM_VPN_PLUGIN_ERROR_GENERAL,
-	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,
-	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
-	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,
-	NM_VPN_PLUGIN_ERROR_WRONG_STATE,
-	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
-	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
-} NMVPNPluginError;
-
-

-

-
-
-
-

NM_VPN_PLUGIN_ERROR

-
#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
-
-

-

-
-
-
-

NM_TYPE_VPN_PLUGIN_ERROR

-
#define NM_TYPE_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_get_type ()) 
-
-

-

-
-
-

NMVPNPlugin

typedef struct {
 	GObject parent;
@@ -174,53 +121,72 @@ enum                
-
nm_vpn_plugin_error_quark ()

-
GQuark              nm_vpn_plugin_error_quark           (void);

+
enum NMVPNPluginError

+
typedef enum {
+	NM_VPN_PLUGIN_ERROR_GENERAL,
+	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,
+	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,
+	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,
+	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,
+	NM_VPN_PLUGIN_ERROR_WRONG_STATE,
+	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
+	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
+} NMVPNPluginError;
+
-

nm_vpn_plugin_error_get_type ()

-
GType               nm_vpn_plugin_error_get_type        (void);
+

NM_VPN_PLUGIN_DBUS_SERVICE_NAME

+
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
+

-

nm_vpn_plugin_get_connection ()

-
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
+

NM_VPN_PLUGIN_STATE

+
#define NM_VPN_PLUGIN_STATE             "state"
+

-

nm_vpn_plugin_get_state ()

-
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
+

nm_vpn_plugin_disconnect ()

+
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);

-

nm_vpn_plugin_set_state ()

-
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);
+

nm_vpn_plugin_error_quark ()

+
GQuark              nm_vpn_plugin_error_quark           (void);

-

nm_vpn_plugin_set_login_banner ()

-
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);
+

nm_vpn_plugin_failure ()

+
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
+                                                         NMVPNPluginFailure reason);

-

nm_vpn_plugin_failure ()

-
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);
+

nm_vpn_plugin_get_connection ()

+
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
+

+

+
+
+
+

nm_vpn_plugin_get_state ()

+
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

@@ -234,9 +200,17 @@ enum -

nm_vpn_plugin_disconnect ()

-
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);
+

nm_vpn_plugin_set_login_banner ()

+
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);
+

+

+
+
+
+

nm_vpn_plugin_set_state ()

+
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);

@@ -244,6 +218,6 @@ enum
- Generated by GTK-Doc V1.17 + Generated by GTK-Doc V1.18 \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html deleted file mode 100644 index 468382ce..00000000 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html +++ /dev/null @@ -1,393 +0,0 @@ - - - - -NMVpnPluginUi - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

NMVpnPluginUi

-

NMVpnPluginUi

-
-
-

Synopsis

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_NONE
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
-#define             NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
-#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
-#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
-#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-enum                NMVpnPluginUiInterfaceProp;
-struct              NMVpnPluginUiInterface;
-NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-#define             NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
-#define             NM_VPN_PLUGIN_UI_WIDGET_INTERFACE   (obj)
-#define             NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)
-#define             NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE(obj)
-struct              NMVpnPluginUiWidgetInterface;
-GType               nm_vpn_plugin_ui_widget_interface_get_type
-                                                        (void);
-GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-
-
-
-

Description

-

-

-
-
-

Details

-
-

NMVpnPluginUiFactory ()

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_factory ()

-
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_CAPABILITY_NONE

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT   0x01
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

-
#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT   0x02
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_NAME

-
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_DESC

-
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

-
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
-
-

-

-
-
-
-

enum NMVpnPluginUiInterfaceProp

-
typedef enum {
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000,
-
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
-} NMVpnPluginUiInterfaceProp;
-
-

-

-
-
-
-

struct NMVpnPluginUiInterface

-
struct NMVpnPluginUiInterface {
-	GTypeInterface g_iface;
-
-	/* Plugin's factory function that returns a GObject that implements
-	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
-	 * if non-NULL.
-	 */
-	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
-	                                              NMConnection *connection,
-	                                              GError **error);
-
-	/* Plugin's capabiltity function that returns a bitmask of capabilities
-	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
-	 */
-	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
-
-	/* Try to import a connection from the specified path.  On success, return a
-	 * partial NMConnection object.  On error, return NULL and set 'error' with
-	 * additional information.  Note that 'error' can be NULL, in which case no
-	 * additional error information should be provided.
-	 */
-	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
-	                                    const char *path,
-	                                    GError **error);
-
-	/* Export the given connection to the specified path.  Return TRUE on success.
-	 * On error, return FALSE and set 'error' with additional error information.
-	 * Note that 'error' can be NULL, in which case no additional error information
-	 * should be provided.
-	 */
-	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
-	                            const char *path,
-	                            NMConnection *connection,
-	                            GError **error);
-
-	/* For a given connection, return a suggested file name.  Returned value should
-	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
-	 * by the caller.
-	 */
-	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
-
-	/* Deprecated and no longer used */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_ui_factory ()

-
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_get_capabilities ()

-
guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_export ()

-
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_get_suggested_name ()

-
char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_delete_connection ()

-
gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE

-
#define NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE      (nm_vpn_plugin_ui_widget_interface_get_type ())
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_WIDGET_INTERFACE()

-
#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
-
-

-

-
-
-
-

NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE()

-
#define NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE))
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE()

-
#define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface))
-
-

-

-
-
-
-

struct NMVpnPluginUiWidgetInterface

-
struct NMVpnPluginUiWidgetInterface {
-	GTypeInterface g_iface;
-
-	/* Return the GtkWidget for the VPN's UI */
-	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
-
-	/* Called to save the user-entered options to the connection object.  Should
-	 * return FALSE and set 'error' if the current options are invalid.  'error'
-	 * should contain enough information for the plugin to determine which UI
-	 * widget is invalid at a later point in time.  For example, creating unique
-	 * error codes for what error occurred and populating the message field
-	 * of 'error' with the name of the invalid property.
-	 */
-	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
-	                               NMConnection *connection,
-	                               GError **error);
-
-	/* Deprecated and no longer used */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
-	/* Emitted when the value of a UI widget changes.  May trigger a validity
-	 * check via update_connection() to write values to the connection */
-	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
-};
-
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_get_type ()

-
GType               nm_vpn_plugin_ui_widget_interface_get_type
-                                                        (void);
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_get_widget ()

-
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_update_connection ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_save_secrets ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-
-
- Generated by GTK-Doc V1.17
- - \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html new file mode 100644 index 00000000..bc7d5bbc --- /dev/null +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html @@ -0,0 +1,347 @@ + + + + +NMVpnPluginUiWidget + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMVpnPluginUiWidget

+

NMVpnPluginUiWidget

+
+
+

Synopsis

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+struct              NMVpnPluginUiInterface;
+enum                NMVpnPluginUiInterfaceProp;
+struct              NMVpnPluginUiWidgetInterface;
+#define             NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
+#define             NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
+#define             NM_VPN_PLUGIN_UI_CAPABILITY_NONE
+#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
+#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
+#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
+NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
+gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);
+guint32             nm_vpn_plugin_ui_interface_get_capabilities
+                                                        (NMVpnPluginUiInterface *iface);
+char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);
+NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         GError **error);
+NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);
+gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+
+
+
+

Description

+

+

+
+
+

Details

+
+

NMVpnPluginUiFactory ()

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+

+

+
+
+
+

struct NMVpnPluginUiInterface

+
struct NMVpnPluginUiInterface {
+	GTypeInterface g_iface;
+
+	/* Plugin's factory function that returns a GObject that implements
+	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
+	 * if non-NULL.
+	 */
+	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
+	                                              NMConnection *connection,
+	                                              GError **error);
+
+	/* Plugin's capabiltity function that returns a bitmask of capabilities
+	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
+	 */
+	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
+
+	/* Try to import a connection from the specified path.  On success, return a
+	 * partial NMConnection object.  On error, return NULL and set 'error' with
+	 * additional information.  Note that 'error' can be NULL, in which case no
+	 * additional error information should be provided.
+	 */
+	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
+	                                    const char *path,
+	                                    GError **error);
+
+	/* Export the given connection to the specified path.  Return TRUE on success.
+	 * On error, return FALSE and set 'error' with additional error information.
+	 * Note that 'error' can be NULL, in which case no additional error information
+	 * should be provided.
+	 */
+	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
+	                            const char *path,
+	                            NMConnection *connection,
+	                            GError **error);
+
+	/* For a given connection, return a suggested file name.  Returned value should
+	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
+	 * by the caller.
+	 */
+	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
+
+	/* Deprecated and no longer used */
+	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
+
+

+

+
+
+
+

enum NMVpnPluginUiInterfaceProp

+
typedef enum {
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000,
+
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
+} NMVpnPluginUiInterfaceProp;
+
+

+

+
+
+
+

struct NMVpnPluginUiWidgetInterface

+
struct NMVpnPluginUiWidgetInterface {
+	GTypeInterface g_iface;
+
+	/* Return the GtkWidget for the VPN's UI */
+	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
+
+	/* Called to save the user-entered options to the connection object.  Should
+	 * return FALSE and set 'error' if the current options are invalid.  'error'
+	 * should contain enough information for the plugin to determine which UI
+	 * widget is invalid at a later point in time.  For example, creating unique
+	 * error codes for what error occurred and populating the message field
+	 * of 'error' with the name of the invalid property.
+	 */
+	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
+	                               NMConnection *connection,
+	                               GError **error);
+
+	/* Deprecated and no longer used */
+	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
+	                          NMConnection *connection,
+	                          GError **error);
+
+	/* Emitted when the value of a UI widget changes.  May trigger a validity
+	 * check via update_connection() to write values to the connection */
+	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
+};
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

+
#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT   0x02
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

+
#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT   0x01
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_CAPABILITY_NONE

+
#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE     0x00
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_DESC

+
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_NAME

+
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

+
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
+
+

+

+
+
+
+

nm_vpn_plugin_ui_factory ()

+
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_delete_connection ()

+
gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_export ()

+
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_get_capabilities ()

+
guint32             nm_vpn_plugin_ui_interface_get_capabilities
+                                                        (NMVpnPluginUiInterface *iface);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_get_suggested_name ()

+
char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_import ()

+
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_interface_ui_factory ()

+
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_widget_interface_get_widget ()

+
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);
+

+

+
+
+
+

nm_vpn_plugin_ui_widget_interface_save_secrets ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+
+
+
+

nm_vpn_plugin_ui_widget_interface_update_connection ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html index 2f00ec53..9c4316ee 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-types.html +++ b/docs/libnm-glib/html/libnm-glib-nm-types.html @@ -8,7 +8,7 @@ - + @@ -37,22 +37,7 @@

Synopsis

-
#define             NM_TYPE_SSID
-GType               nm_ssid_get_type                    (void);
-#define             NM_TYPE_UINT_ARRAY
-GType               nm_uint_array_get_type              (void);
-#define             NM_TYPE_STRING_ARRAY
-GType               nm_string_array_get_type            (void);
-#define             NM_TYPE_OBJECT_ARRAY
-GType               nm_object_array_get_type            (void);
-#define             NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY
-GType               nm_ip6_address_object_array_get_type
-                                                        (void);
-#define             NM_TYPE_IP6_ADDRESS_ARRAY
-GType               nm_ip6_address_array_get_type       (void);
-#define             NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
-GType               nm_ip6_route_object_array_get_type  (void);
-
+

 

 

 
Description

@@ -61,115 +46,10 @@
 

 

 
Details

-

-
NM_TYPE_SSID

-
#define NM_TYPE_SSID  (nm_ssid_get_type ())
-

-

-

-

-

-

-
nm_ssid_get_type ()

-
GType               nm_ssid_get_type                    (void);

-

-

-

-

-

-
NM_TYPE_UINT_ARRAY

-
#define NM_TYPE_UINT_ARRAY  (nm_uint_array_get_type ())
-

-

-

-

-

-

-
nm_uint_array_get_type ()

-
GType               nm_uint_array_get_type              (void);

-

-

-

-

-

-
NM_TYPE_STRING_ARRAY

-
#define NM_TYPE_STRING_ARRAY  (nm_string_array_get_type ())
-

-

-

-

-

-

-
nm_string_array_get_type ()

-
GType               nm_string_array_get_type            (void);

-

-

-

-

-

-
NM_TYPE_OBJECT_ARRAY

-
#define NM_TYPE_OBJECT_ARRAY  (nm_object_array_get_type ())
-

-

-

-

-

-

-
nm_object_array_get_type ()

-
GType               nm_object_array_get_type            (void);

-

-

-

-

-

-
NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY

-
#define NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY  (nm_ip6_address_object_array_get_type ())
-

-

-

-

-

-

-
nm_ip6_address_object_array_get_type ()

-
GType               nm_ip6_address_object_array_get_type
-                                                        (void);

-

-

-

-

-

-
NM_TYPE_IP6_ADDRESS_ARRAY

-
#define NM_TYPE_IP6_ADDRESS_ARRAY  (nm_ip6_address_array_get_type ())
-

-

-

-

-

-

-
nm_ip6_address_array_get_type ()

-
GType               nm_ip6_address_array_get_type       (void);

-

-

-

-

-

-
NM_TYPE_IP6_ROUTE_OBJECT_ARRAY

-
#define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY  (nm_ip6_route_object_array_get_type ())
-

-

-

-

-

-

-
nm_ip6_route_object_array_get_type ()

-
GType               nm_ip6_route_object_array_get_type  (void);

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 164576fb..a473684c 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -6,15 +6,15 @@
 
 
 
-
+
 
-
+
 
 
 
 
-
+
@@ -37,14 +37,14 @@
 
 

 
Synopsis

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);
-gboolean            nm_vpn_plugin_utils_get_secret_flags
+
gboolean            nm_vpn_plugin_utils_get_secret_flags
                                                         (GHashTable *data,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags *out_flags);
+gboolean            nm_vpn_plugin_utils_read_vpn_details
+                                                        (int fd,
+                                                         GHashTable **out_data,
+                                                         GHashTable **out_secrets);
 

 

 

@@ -55,75 +55,75 @@
 

 
Details

 

-
nm_vpn_plugin_utils_read_vpn_details ()

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);

+
nm_vpn_plugin_utils_get_secret_flags ()

+
gboolean            nm_vpn_plugin_utils_get_secret_flags
+                                                        (GHashTable *data,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags);

 

-Parses key/value pairs from a file descriptor (normally stdin) passed by
-an applet when the applet calls the authentication dialog of the VPN plugin.
+Given a VPN secret key name, attempts to find the corresponding flags data
+item in data.  If found, converts the flags data item to
+NMSettingSecretFlags and returns it.
 

 

-
-
+
+
-
-
+
+
-
-
+
+TRUE if the flag data item was found and successfully converted
+to flags, FALSE if not

 
 
 
fd :
file descriptor to read from, usually stdin (0)
data :
hash table containing VPN key/value pair data items
 

 
out_data :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
-
secret_name :
VPN secret key name for which to retrieve flags for
 

 
out_secrets :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
+
out_flags :
on success, the flags associated with secret_name. [out]
 
 

 

 
Returns :

 
-TRUE if reading values was successful, FALSE if not
 

 
 

 

 

 

-
nm_vpn_plugin_utils_get_secret_flags ()

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);

+
nm_vpn_plugin_utils_read_vpn_details ()

+
gboolean            nm_vpn_plugin_utils_read_vpn_details
+                                                        (int fd,
+                                                         GHashTable **out_data,
+                                                         GHashTable **out_secrets);

 

-Given a VPN secret key name, attempts to find the corresponding flags data
-item in data.  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.
+Parses key/value pairs from a file descriptor (normally stdin) passed by
+an applet when the applet calls the authentication dialog of the VPN plugin.
 

 

-
-
+
+
-
-
+
+
-
-
+
+TRUE if reading values was successful, FALSE if not

 
 
 
data :
hash table containing VPN key/value pair data items
fd :
file descriptor to read from, usually stdin (0)
 

 
secret_name :
VPN secret key name for which to retrieve flags for
out_data :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
+
 

 
out_flags :
on success, the flags associated with secret_name. [out]
+
out_secrets :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
 
 

 

 
Returns :

 
-TRUE if the flag data item was found and successfully converted
-to flags, FALSE if not
 

 
 

@@ -132,6 +132,6 @@ to flags, 
 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp b/docs/libnm-glib/html/libnm-glib.devhelp
deleted file mode 100644
index 54edc1f6..00000000
--- a/docs/libnm-glib/html/libnm-glib.devhelp
+++ /dev/null
@@ -1,496 +0,0 @@
-
-
-
-  
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 866602d8..74226d52 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -25,7 +25,7 @@
       
       
       
-      
+      
       
     
     
@@ -33,47 +33,47 @@
     
   
   
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
+    
+    
     
-    
     
+    
     
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
     
     
@@ -88,68 +88,68 @@
     
     
     
+    
+    
     
-    
-    
-    
-    
     
     
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
     
     
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
+    
     
-    
-    
     
+    
     
-    
     
-    
+    
+    
+    
     
-    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
+    
+    
     
-    
-    
     
+    
     
-    
     
-    
-    
-    
+    
+    
     
+    
+    
     
-    
-    
-    
-    
+    
     
     
     
@@ -167,38 +167,38 @@
     
     
     
+    
+    
+    
     
     
     
-    
-    
-    
-    
+    
     
     
     
-    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -207,45 +207,45 @@
     
     
     
-    
-    
     
     
-    
+    
+    
     
+    
     
     
-    
-    
-    
     
     
-    
+    
+    
+    
+    
     
     
-    
+    
     
     
     
-    
+    
+    
     
+    
     
-    
     
+    
+    
     
-    
-    
-    
-    
-    
     
+    
+    
+    
+    
     
     
-    
     
-    
     
-    
+    
     
     
     
@@ -255,46 +255,46 @@
     
     
     
-    
-    
-    
-    
     
     
-    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
+    
     
     
     
-    
-    
-    
-    
+    
+    
     
+    
     
-    
+    
     
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
-    
+    
     
+    
+    
+    
     
-    
-    
-    
+    
+    
     
     
     
@@ -308,16 +308,16 @@
     
     
     
-    
     
+    
     
     
-    
     
-    
     
+    
     
     
+    
     
     
     
@@ -326,14 +326,14 @@
     
     
     
-    
     
+    
     
-    
     
-    
     
+    
     
+    
     
     
     
@@ -341,61 +341,58 @@
     
     
     
-    
-    
     
+    
+    
     
     
     
     
-    
-    
     
+    
+    
     
-    
-    
     
     
+    
+    
     
     
     
     
-    
-    
     
     
     
     
     
-    
+    
+    
     
     
     
+    
     
     
     
     
     
+    
+    
+    
     
-    
-    
-    
+    
     
-    
-    
     
-    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
     
-    
+    
+    
     
     
     
@@ -403,95 +400,70 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
     
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
     
-    
+    
     
     
     
-    
-    
     
     
-    
-    
+    
+    
     
+    
+    
     
     
     
-    
-    
-    
-    
-    
     
     
+    
+    
+    
+    
     
-    
+    
     
     
-    
-    
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
     
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index db0f954b..1da8b8e0 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -48,6 +48,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index 9465073b..db83e194 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,6 +42,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index b4475d2f..7c517f3d 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -1,566 +1,307 @@
 

-nm-active-connection
-NMActiveConnection
-NM_ACTIVE_CONNECTION_CONNECTION
-NM_ACTIVE_CONNECTION_UUID
-NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-NM_ACTIVE_CONNECTION_DEVICES
-NM_ACTIVE_CONNECTION_STATE
-NM_ACTIVE_CONNECTION_DEFAULT
-NM_ACTIVE_CONNECTION_DEFAULT6
-NMActiveConnection
-NMActiveConnectionClass
-nm_active_connection_new
-nm_active_connection_get_connection
-nm_active_connection_get_uuid
-nm_active_connection_get_specific_object
-nm_active_connection_get_devices
-nm_active_connection_get_state
-nm_active_connection_get_default
-nm_active_connection_get_default6
-
-NM_ACTIVE_CONNECTION
-NM_IS_ACTIVE_CONNECTION
-NM_TYPE_ACTIVE_CONNECTION
-nm_active_connection_get_type
-NM_ACTIVE_CONNECTION_CLASS
-NM_IS_ACTIVE_CONNECTION_CLASS
-NM_ACTIVE_CONNECTION_GET_CLASS
-

+libnm_glib
 
-

-nm-remote-settings
-NMRemoteSettings
-NMRemoteSettingsError
-NM_TYPE_REMOTE_SETTINGS_ERROR
-NM_REMOTE_SETTINGS_ERROR
-nm_remote_settings_error_quark
-NM_REMOTE_SETTINGS_BUS
-NM_REMOTE_SETTINGS_SERVICE_RUNNING
-NM_REMOTE_SETTINGS_HOSTNAME
-NM_REMOTE_SETTINGS_CAN_MODIFY
-NM_REMOTE_SETTINGS_NEW_CONNECTION
-NM_REMOTE_SETTINGS_CONNECTIONS_READ
-NMRemoteSettingsAddConnectionFunc
-NMRemoteSettingsSaveHostnameFunc
-NMRemoteSettings
-NMRemoteSettingsClass
-nm_remote_settings_get_type
-nm_remote_settings_new
-nm_remote_settings_list_connections
-nm_remote_settings_get_connection_by_path
-nm_remote_settings_get_connection_by_uuid
-nm_remote_settings_add_connection
-nm_remote_settings_save_hostname
-
-NM_REMOTE_SETTINGS
-NM_IS_REMOTE_SETTINGS
-NM_TYPE_REMOTE_SETTINGS
-nm_remote_settings_error_get_type
-NM_REMOTE_SETTINGS_CLASS
-NM_IS_REMOTE_SETTINGS_CLASS
-NM_REMOTE_SETTINGS_GET_CLASS
-

-
-

-nm-device-wimax
-NMDeviceWimax
-NM_DEVICE_WIMAX_HW_ADDRESS
-NM_DEVICE_WIMAX_ACTIVE_NSP
-NM_DEVICE_WIMAX_CENTER_FREQUENCY
-NM_DEVICE_WIMAX_RSSI
-NM_DEVICE_WIMAX_CINR
-NM_DEVICE_WIMAX_TX_POWER
-NM_DEVICE_WIMAX_BSID
-NMDeviceWimax
-NMDeviceWimaxClass
-nm_device_wimax_new
-nm_device_wimax_get_hw_address
-nm_device_wimax_get_active_nsp
-nm_device_wimax_get_nsp_by_path
-nm_device_wimax_get_nsps
-nm_device_wimax_get_center_frequency
-nm_device_wimax_get_rssi
-nm_device_wimax_get_cinr
-nm_device_wimax_get_tx_power
-nm_device_wimax_get_bsid
-
-NM_DEVICE_WIMAX
-NM_IS_DEVICE_WIMAX
-NM_TYPE_DEVICE_WIMAX
-nm_device_wimax_get_type
-NM_DEVICE_WIMAX_CLASS
-NM_IS_DEVICE_WIMAX_CLASS
-NM_DEVICE_WIMAX_GET_CLASS
-

-
-

-nm-device-wifi
-NMDeviceWifi
-NM_DEVICE_WIFI_HW_ADDRESS
-NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-NM_DEVICE_WIFI_MODE
-NM_DEVICE_WIFI_BITRATE
-NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
-NM_DEVICE_WIFI_CAPABILITIES
-NMDeviceWifi
-NMDeviceWifiClass
-nm_device_wifi_new
-nm_device_wifi_get_hw_address
-nm_device_wifi_get_permanent_hw_address
-nm_device_wifi_get_mode
-nm_device_wifi_get_bitrate
-nm_device_wifi_get_capabilities
-nm_device_wifi_get_active_access_point
-nm_device_wifi_get_access_point_by_path
-nm_device_wifi_get_access_points
-
-NM_DEVICE_WIFI
-NM_IS_DEVICE_WIFI
-NM_TYPE_DEVICE_WIFI
-nm_device_wifi_get_type
-NM_DEVICE_WIFI_CLASS
-NM_IS_DEVICE_WIFI_CLASS
-NM_DEVICE_WIFI_GET_CLASS
-

-
-

-nm-dhcp6-config
-NMDHCP6Config
-NMDHCP6Config
-NMDHCP6ConfigClass
-NM_DHCP6_CONFIG_OPTIONS
-nm_dhcp6_config_new
-nm_dhcp6_config_get_options
-nm_dhcp6_config_get_one_option
-
-NM_DHCP6_CONFIG
-NM_IS_DHCP6_CONFIG
-NM_TYPE_DHCP6_CONFIG
-nm_dhcp6_config_get_type
-NM_DHCP6_CONFIG_CLASS
-NM_IS_DHCP6_CONFIG_CLASS
-

-
-

-nm-object
-NMObject
-NM_OBJECT_DBUS_CONNECTION
-NM_OBJECT_DBUS_PATH
-NMObject
-NMObjectClass
-nm_object_get_connection
-nm_object_get_path
-
-NM_OBJECT
-NM_IS_OBJECT
-NM_TYPE_OBJECT
-nm_object_get_type
-NM_OBJECT_CLASS
-NM_IS_OBJECT_CLASS
-NM_OBJECT_GET_CLASS
-

-
-

-nm-secret-agent
-NMSecretAgent
-NM_SECRET_AGENT_ERROR
-NM_TYPE_SECRET_AGENT_ERROR
-nm_secret_agent_error_quark
-NMSecretAgentError
-NMSecretAgentGetSecretsFlags
-NM_SECRET_AGENT_IDENTIFIER
-NM_SECRET_AGENT_AUTO_REGISTER
-NM_SECRET_AGENT_REGISTRATION_RESULT
-NMSecretAgent
-NMSecretAgentGetSecretsFunc
-NMSecretAgentSaveSecretsFunc
-NMSecretAgentDeleteSecretsFunc
-NMSecretAgentClass
-nm_secret_agent_get_type
-nm_secret_agent_register
-nm_secret_agent_unregister
-nm_secret_agent_get_secrets
-nm_secret_agent_save_secrets
-nm_secret_agent_delete_secrets
-
-NM_SECRET_AGENT
-NM_IS_SECRET_AGENT
-NM_TYPE_SECRET_AGENT
-nm_secret_agent_error_get_type
-NM_SECRET_AGENT_CLASS
-NM_IS_SECRET_AGENT_CLASS
-NM_SECRET_AGENT_GET_CLASS
-

-
-

-nm-ip4-config
-NMIP4Config
-NMIP4Config
-NMIP4ConfigClass
-NM_IP4_CONFIG_ADDRESSES
-NM_IP4_CONFIG_NAMESERVERS
-NM_IP4_CONFIG_DOMAINS
-NM_IP4_CONFIG_ROUTES
-NM_IP4_CONFIG_WINS_SERVERS
-nm_ip4_config_new
-nm_ip4_config_get_addresses
-nm_ip4_config_get_nameservers
-nm_ip4_config_get_domains
-nm_ip4_config_get_routes
-nm_ip4_config_get_wins_servers
-
-NM_IP4_CONFIG
-NM_IS_IP4_CONFIG
-NM_TYPE_IP4_CONFIG
-nm_ip4_config_get_type
-NM_IP4_CONFIG_CLASS
-NM_IS_IP4_CONFIG_CLASS
-NM_IP4_CONFIG_GET_CLASS
-

-
-

-nm-vpn-plugin
-NMVPNPlugin
-NM_VPN_PLUGIN_DBUS_SERVICE_NAME
-NM_VPN_PLUGIN_STATE
-NMVPNPluginError
-NM_VPN_PLUGIN_ERROR
-NM_TYPE_VPN_PLUGIN_ERROR
-NMVPNPlugin
-NMVPNPluginClass
-nm_vpn_plugin_error_quark
-nm_vpn_plugin_error_get_type
-nm_vpn_plugin_get_connection
-nm_vpn_plugin_get_state
-nm_vpn_plugin_set_state
-nm_vpn_plugin_set_login_banner
-nm_vpn_plugin_failure
-nm_vpn_plugin_set_ip4_config
-nm_vpn_plugin_disconnect
-
-NM_VPN_PLUGIN
-NM_IS_VPN_PLUGIN
-NM_TYPE_VPN_PLUGIN
-nm_vpn_plugin_get_type
-NM_VPN_PLUGIN_CLASS
-NM_IS_VPN_PLUGIN_CLASS
-NM_VPN_PLUGIN_GET_CLASS
 

 
 

 nm-access-point
 NMAccessPoint
-NM_ACCESS_POINT_FLAGS
-NM_ACCESS_POINT_WPA_FLAGS
-NM_ACCESS_POINT_RSN_FLAGS
-NM_ACCESS_POINT_SSID
+NMAccessPoint
+NMAccessPointClass
 NM_ACCESS_POINT_BSSID
+NM_ACCESS_POINT_FLAGS
 NM_ACCESS_POINT_FREQUENCY
-NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_HW_ADDRESS
 NM_ACCESS_POINT_MAX_BITRATE
+NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_RSN_FLAGS
+NM_ACCESS_POINT_SSID
 NM_ACCESS_POINT_STRENGTH
-NM_ACCESS_POINT_HW_ADDRESS
-NMAccessPoint
-NMAccessPointClass
-nm_access_point_new
-nm_access_point_get_flags
-nm_access_point_get_wpa_flags
-nm_access_point_get_rsn_flags
-nm_access_point_get_ssid
+NM_ACCESS_POINT_WPA_FLAGS
+nm_access_point_connection_valid
+nm_access_point_filter_connections
 nm_access_point_get_bssid
+nm_access_point_get_flags
 nm_access_point_get_frequency
-nm_access_point_get_mode
+nm_access_point_get_hw_address
 nm_access_point_get_max_bitrate
+nm_access_point_get_mode
+nm_access_point_get_rsn_flags
+nm_access_point_get_ssid
 nm_access_point_get_strength
-nm_access_point_filter_connections
-nm_access_point_connection_valid
-nm_access_point_get_hw_address
+nm_access_point_get_wpa_flags
+nm_access_point_new
+
+NM_ACCESS_POINT
+NM_ACCESS_POINT_CLASS
+NM_ACCESS_POINT_GET_CLASS
+NM_IS_ACCESS_POINT
+NM_IS_ACCESS_POINT_CLASS
+NM_TYPE_ACCESS_POINT
+nm_access_point_get_type
+

+
+

+nm-active-connection
+NMActiveConnection
+NMActiveConnection
+NMActiveConnectionClass
+NM_ACTIVE_CONNECTION_CONNECTION
+NM_ACTIVE_CONNECTION_DEFAULT
+NM_ACTIVE_CONNECTION_DEFAULT6
+NM_ACTIVE_CONNECTION_DEVICES
+NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
+NM_ACTIVE_CONNECTION_STATE
+NM_ACTIVE_CONNECTION_UUID
+nm_active_connection_get_connection
+nm_active_connection_get_default
+nm_active_connection_get_default6
+nm_active_connection_get_devices
+nm_active_connection_get_specific_object
+nm_active_connection_get_state
+nm_active_connection_get_uuid
+nm_active_connection_new
 
-NM_ACCESS_POINT
-NM_IS_ACCESS_POINT
-NM_TYPE_ACCESS_POINT
-nm_access_point_get_type
-NM_ACCESS_POINT_CLASS
-NM_IS_ACCESS_POINT_CLASS
-NM_ACCESS_POINT_GET_CLASS
+NM_ACTIVE_CONNECTION
+NM_ACTIVE_CONNECTION_CLASS
+NM_ACTIVE_CONNECTION_GET_CLASS
+NM_IS_ACTIVE_CONNECTION
+NM_IS_ACTIVE_CONNECTION_CLASS
+NM_TYPE_ACTIVE_CONNECTION
+nm_active_connection_get_type
+

+
+

+nm-client
+NMClient
+NMClient
+NMClientActivateFn
+NMClientAddActivateFn
+NMClientClass
+NMClientPermission
+NMClientPermissionResult
+NM_CLIENT_ACTIVE_CONNECTIONS
+NM_CLIENT_MANAGER_RUNNING
+NM_CLIENT_NETWORKING_ENABLED
+NM_CLIENT_STATE
+NM_CLIENT_VERSION
+NM_CLIENT_WIMAX_ENABLED
+NM_CLIENT_WIMAX_HARDWARE_ENABLED
+NM_CLIENT_WIRELESS_ENABLED
+NM_CLIENT_WIRELESS_HARDWARE_ENABLED
+NM_CLIENT_WWAN_ENABLED
+NM_CLIENT_WWAN_HARDWARE_ENABLED
+nm_client_activate_connection
+nm_client_add_and_activate_connection
+nm_client_deactivate_connection
+nm_client_get_active_connections
+nm_client_get_device_by_iface
+nm_client_get_device_by_path
+nm_client_get_devices
+nm_client_get_manager_running
+nm_client_get_permission_result
+nm_client_get_state
+nm_client_get_version
+nm_client_networking_get_enabled
+nm_client_networking_set_enabled
+nm_client_new
+nm_client_sleep
+nm_client_wimax_get_enabled
+nm_client_wimax_hardware_get_enabled
+nm_client_wimax_set_enabled
+nm_client_wireless_get_enabled
+nm_client_wireless_hardware_get_enabled
+nm_client_wireless_set_enabled
+nm_client_wwan_get_enabled
+nm_client_wwan_hardware_get_enabled
+nm_client_wwan_set_enabled
+
+NM_CLIENT
+NM_CLIENT_CLASS
+NM_CLIENT_GET_CLASS
+NM_IS_CLIENT
+NM_IS_CLIENT_CLASS
+NM_TYPE_CLIENT
+nm_client_get_type
 

 
 

 nm-device
 NMDevice
+NMDevice
+NMDeviceClass
+NMDeviceDeactivateFn
+NM_DEVICE_ACTIVE_CONNECTION
+NM_DEVICE_CAPABILITIES
 NM_DEVICE_DEVICE_TYPE
-NM_DEVICE_UDI
-NM_DEVICE_INTERFACE
-NM_DEVICE_IP_INTERFACE
+NM_DEVICE_DHCP4_CONFIG
+NM_DEVICE_DHCP6_CONFIG
 NM_DEVICE_DRIVER
-NM_DEVICE_CAPABILITIES
-NM_DEVICE_MANAGED
 NM_DEVICE_FIRMWARE_MISSING
+NM_DEVICE_INTERFACE
 NM_DEVICE_IP4_CONFIG
-NM_DEVICE_DHCP4_CONFIG
 NM_DEVICE_IP6_CONFIG
-NM_DEVICE_DHCP6_CONFIG
+NM_DEVICE_IP_INTERFACE
+NM_DEVICE_MANAGED
+NM_DEVICE_PRODUCT
 NM_DEVICE_STATE
-NM_DEVICE_ACTIVE_CONNECTION
+NM_DEVICE_UDI
 NM_DEVICE_VENDOR
-NM_DEVICE_PRODUCT
-NMDevice
-NMDeviceClass
-nm_device_new
-nm_device_get_iface
-nm_device_get_ip_iface
+nm_device_connection_valid
+nm_device_disconnect
+nm_device_filter_connections
+nm_device_get_active_connection
+nm_device_get_capabilities
 nm_device_get_device_type
-nm_device_get_udi
+nm_device_get_dhcp4_config
+nm_device_get_dhcp6_config
 nm_device_get_driver
-nm_device_get_capabilities
-nm_device_get_managed
 nm_device_get_firmware_missing
+nm_device_get_iface
 nm_device_get_ip4_config
-nm_device_get_dhcp4_config
 nm_device_get_ip6_config
-nm_device_get_dhcp6_config
-nm_device_get_state
-nm_device_get_active_connection
+nm_device_get_ip_iface
+nm_device_get_managed
 nm_device_get_product
+nm_device_get_state
+nm_device_get_udi
 nm_device_get_vendor
-NMDeviceDeactivateFn
-nm_device_disconnect
-nm_device_filter_connections
-nm_device_connection_valid
+nm_device_new
 
 NM_DEVICE
+NM_DEVICE_CLASS
+NM_DEVICE_GET_CLASS
 NM_IS_DEVICE
+NM_IS_DEVICE_CLASS
 NM_TYPE_DEVICE
 nm_device_get_type
-NM_DEVICE_CLASS
-NM_IS_DEVICE_CLASS
-NM_DEVICE_GET_CLASS
+

+
+

+nm-device-bt
+NMDeviceBt
+NMDeviceBt
+NMDeviceBtClass
+NM_DEVICE_BT_CAPABILITIES
+NM_DEVICE_BT_HW_ADDRESS
+NM_DEVICE_BT_NAME
+nm_device_bt_get_capabilities
+nm_device_bt_get_hw_address
+nm_device_bt_get_name
+nm_device_bt_new
+
+NM_DEVICE_BT
+NM_DEVICE_BT_CLASS
+NM_DEVICE_BT_GET_CLASS
+NM_IS_DEVICE_BT
+NM_IS_DEVICE_BT_CLASS
+NM_TYPE_DEVICE_BT
+nm_device_bt_get_type
 

 
 

 nm-device-ethernet
 NMDeviceEthernet
+NMDeviceEthernet
+NMDeviceEthernetClass
+NM_DEVICE_ETHERNET_CARRIER
 NM_DEVICE_ETHERNET_HW_ADDRESS
 NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 NM_DEVICE_ETHERNET_SPEED
-NM_DEVICE_ETHERNET_CARRIER
-NMDeviceEthernet
-NMDeviceEthernetClass
-nm_device_ethernet_new
+nm_device_ethernet_get_carrier
 nm_device_ethernet_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
 nm_device_ethernet_get_speed
-nm_device_ethernet_get_carrier
+nm_device_ethernet_new
 
 NM_DEVICE_ETHERNET
+NM_DEVICE_ETHERNET_CLASS
+NM_DEVICE_ETHERNET_GET_CLASS
 NM_IS_DEVICE_ETHERNET
+NM_IS_DEVICE_ETHERNET_CLASS
 NM_TYPE_DEVICE_ETHERNET
 nm_device_ethernet_get_type
-NM_DEVICE_ETHERNET_CLASS
-NM_IS_DEVICE_ETHERNET_CLASS
-NM_DEVICE_ETHERNET_GET_CLASS
-

-
-

-nm-vpn-connection
-NMVPNConnection
-NM_VPN_CONNECTION_VPN_STATE
-NM_VPN_CONNECTION_BANNER
-NMVPNConnection
-NMVPNConnectionClass
-nm_vpn_connection_new
-nm_vpn_connection_get_vpn_state
-nm_vpn_connection_get_banner
-
-NM_VPN_CONNECTION
-NM_IS_VPN_CONNECTION
-NM_TYPE_VPN_CONNECTION
-nm_vpn_connection_get_type
-NM_VPN_CONNECTION_CLASS
-NM_IS_VPN_CONNECTION_CLASS
-NM_VPN_CONNECTION_GET_CLASS
-

-
-

-nm-vpn-plugin-ui-interface
-NMVpnPluginUiWidget
-NMVpnPluginUi
-NMVpnPluginUiFactory
-nm_vpn_plugin_ui_factory
-NM_VPN_PLUGIN_UI_CAPABILITY_NONE
-NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
-NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
-NM_VPN_PLUGIN_UI_INTERFACE_NAME
-NM_VPN_PLUGIN_UI_INTERFACE_DESC
-NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-NMVpnPluginUiInterfaceProp
-NMVpnPluginUiInterface
-nm_vpn_plugin_ui_interface_ui_factory
-nm_vpn_plugin_ui_interface_get_capabilities
-nm_vpn_plugin_ui_interface_import
-nm_vpn_plugin_ui_interface_export
-nm_vpn_plugin_ui_interface_get_suggested_name
-nm_vpn_plugin_ui_interface_delete_connection
-NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
-NM_VPN_PLUGIN_UI_WIDGET_INTERFACE
-NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
-NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE
-NMVpnPluginUiWidgetInterface
-nm_vpn_plugin_ui_widget_interface_get_type
-nm_vpn_plugin_ui_widget_interface_get_widget
-nm_vpn_plugin_ui_widget_interface_update_connection
-nm_vpn_plugin_ui_widget_interface_save_secrets
-
-NM_VPN_PLUGIN_UI_INTERFACE
-NM_IS_VPN_PLUGIN_UI_INTERFACE
-NM_TYPE_VPN_PLUGIN_UI_INTERFACE
-nm_vpn_plugin_ui_interface_get_type
-NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE
-

-
-

-nm-ip6-config
-NMIP6Config
-NMIP6Config
-NMIP6ConfigClass
-NM_IP6_CONFIG_ADDRESSES
-NM_IP6_CONFIG_NAMESERVERS
-NM_IP6_CONFIG_DOMAINS
-NM_IP6_CONFIG_ROUTES
-nm_ip6_config_new
-nm_ip6_config_get_addresses
-nm_ip6_config_get_nameservers
-nm_ip6_config_get_domains
-nm_ip6_config_get_routes
-
-NM_IP6_CONFIG
-NM_IS_IP6_CONFIG
-NM_TYPE_IP6_CONFIG
-nm_ip6_config_get_type
-NM_IP6_CONFIG_CLASS
-NM_IS_IP6_CONFIG_CLASS
-NM_IP6_CONFIG_GET_CLASS
 

 
 

 nm-device-modem
 NMDeviceModem
-NM_DEVICE_MODEM_MODEM_CAPABILITIES
-NM_DEVICE_MODEM_CURRENT_CAPABILITIES
 NMDeviceModem
 NMDeviceModemClass
-nm_device_modem_get_modem_capabilities
+NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+NM_DEVICE_MODEM_MODEM_CAPABILITIES
 nm_device_modem_get_current_capabilities
+nm_device_modem_get_modem_capabilities
 
 NM_DEVICE_MODEM
+NM_DEVICE_MODEM_CLASS
+NM_DEVICE_MODEM_GET_CLASS
 NM_IS_DEVICE_MODEM
+NM_IS_DEVICE_MODEM_CLASS
 NM_TYPE_DEVICE_MODEM
 nm_device_modem_get_type
-NM_DEVICE_MODEM_CLASS
-NM_IS_DEVICE_MODEM_CLASS
-NM_DEVICE_MODEM_GET_CLASS
-

-
-

-nm-wimax-nsp
-NMWimaxNsp
-NM_WIMAX_NSP_NAME
-NM_WIMAX_NSP_SIGNAL_QUALITY
-NM_WIMAX_NSP_NETWORK_TYPE
-NMWimaxNspNetworkType
-NMWimaxNsp
-NMWimaxNspClass
-nm_wimax_nsp_new
-nm_wimax_nsp_get_name
-nm_wimax_nsp_get_signal_quality
-nm_wimax_nsp_get_network_type
-nm_wimax_nsp_filter_connections
-nm_wimax_nsp_connection_valid
-
-NM_WIMAX_NSP
-NM_IS_WIMAX_NSP
-NM_TYPE_WIMAX_NSP
-nm_wimax_nsp_get_type
-NM_WIMAX_NSP_CLASS
-NM_IS_WIMAX_NSP_CLASS
-NM_WIMAX_NSP_GET_CLASS
 

 
 

-nm-device-bt
-NMDeviceBt
-NM_DEVICE_BT_HW_ADDRESS
-NM_DEVICE_BT_NAME
-NM_DEVICE_BT_CAPABILITIES
-NMDeviceBt
-NMDeviceBtClass
-nm_device_bt_new
-nm_device_bt_get_hw_address
-nm_device_bt_get_name
-nm_device_bt_get_capabilities
+nm-device-wifi
+NMDeviceWifi
+NMDeviceWifi
+NMDeviceWifiClass
+NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
+NM_DEVICE_WIFI_BITRATE
+NM_DEVICE_WIFI_CAPABILITIES
+NM_DEVICE_WIFI_HW_ADDRESS
+NM_DEVICE_WIFI_MODE
+NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
+nm_device_wifi_get_access_point_by_path
+nm_device_wifi_get_access_points
+nm_device_wifi_get_active_access_point
+nm_device_wifi_get_bitrate
+nm_device_wifi_get_capabilities
+nm_device_wifi_get_hw_address
+nm_device_wifi_get_mode
+nm_device_wifi_get_permanent_hw_address
+nm_device_wifi_new
 
-NM_DEVICE_BT
-NM_IS_DEVICE_BT
-NM_TYPE_DEVICE_BT
-nm_device_bt_get_type
-NM_DEVICE_BT_CLASS
-NM_IS_DEVICE_BT_CLASS
-NM_DEVICE_BT_GET_CLASS
+NM_DEVICE_WIFI
+NM_DEVICE_WIFI_CLASS
+NM_DEVICE_WIFI_GET_CLASS
+NM_IS_DEVICE_WIFI
+NM_IS_DEVICE_WIFI_CLASS
+NM_TYPE_DEVICE_WIFI
+nm_device_wifi_get_type
 

 
 

-nm-client
-NMClient
-NM_CLIENT_VERSION
-NM_CLIENT_STATE
-NM_CLIENT_MANAGER_RUNNING
-NM_CLIENT_NETWORKING_ENABLED
-NM_CLIENT_WIRELESS_ENABLED
-NM_CLIENT_WIRELESS_HARDWARE_ENABLED
-NM_CLIENT_WWAN_ENABLED
-NM_CLIENT_WWAN_HARDWARE_ENABLED
-NM_CLIENT_WIMAX_ENABLED
-NM_CLIENT_WIMAX_HARDWARE_ENABLED
-NM_CLIENT_ACTIVE_CONNECTIONS
-NMClientPermission
-NMClientPermissionResult
-NMClient
-NMClientClass
-nm_client_new
-nm_client_get_devices
-nm_client_get_device_by_path
-nm_client_get_device_by_iface
-NMClientActivateFn
-nm_client_activate_connection
-NMClientAddActivateFn
-nm_client_add_and_activate_connection
-nm_client_deactivate_connection
-nm_client_networking_get_enabled
-nm_client_networking_set_enabled
-nm_client_wireless_get_enabled
-nm_client_wireless_set_enabled
-nm_client_wireless_hardware_get_enabled
-nm_client_wwan_get_enabled
-nm_client_wwan_set_enabled
-nm_client_wwan_hardware_get_enabled
-nm_client_wimax_get_enabled
-nm_client_wimax_set_enabled
-nm_client_wimax_hardware_get_enabled
-nm_client_get_version
-nm_client_get_state
-nm_client_get_manager_running
-nm_client_get_active_connections
-nm_client_sleep
-nm_client_get_permission_result
+nm-device-wimax
+NMDeviceWimax
+NMDeviceWimax
+NMDeviceWimaxClass
+NM_DEVICE_WIMAX_ACTIVE_NSP
+NM_DEVICE_WIMAX_BSID
+NM_DEVICE_WIMAX_CENTER_FREQUENCY
+NM_DEVICE_WIMAX_CINR
+NM_DEVICE_WIMAX_HW_ADDRESS
+NM_DEVICE_WIMAX_RSSI
+NM_DEVICE_WIMAX_TX_POWER
+nm_device_wimax_get_active_nsp
+nm_device_wimax_get_bsid
+nm_device_wimax_get_center_frequency
+nm_device_wimax_get_cinr
+nm_device_wimax_get_hw_address
+nm_device_wimax_get_nsp_by_path
+nm_device_wimax_get_nsps
+nm_device_wimax_get_rssi
+nm_device_wimax_get_tx_power
+nm_device_wimax_new
 
-NM_CLIENT
-NM_IS_CLIENT
-NM_TYPE_CLIENT
-nm_client_get_type
-NM_CLIENT_CLASS
-NM_IS_CLIENT_CLASS
-NM_CLIENT_GET_CLASS
+NM_DEVICE_WIMAX
+NM_DEVICE_WIMAX_CLASS
+NM_DEVICE_WIMAX_GET_CLASS
+NM_IS_DEVICE_WIMAX
+NM_IS_DEVICE_WIMAX_CLASS
+NM_TYPE_DEVICE_WIMAX
+nm_device_wimax_get_type
 

 
 

@@ -569,92 +310,358 @@ NM_CLIENT_GET_CLASS
 NMDHCP4Config
 NMDHCP4ConfigClass
 NM_DHCP4_CONFIG_OPTIONS
-nm_dhcp4_config_new
-nm_dhcp4_config_get_options
 nm_dhcp4_config_get_one_option
+nm_dhcp4_config_get_options
+nm_dhcp4_config_new
 
 NM_DHCP4_CONFIG
+NM_DHCP4_CONFIG_CLASS
 NM_IS_DHCP4_CONFIG
+NM_IS_DHCP4_CONFIG_CLASS
 NM_TYPE_DHCP4_CONFIG
 nm_dhcp4_config_get_type
-NM_DHCP4_CONFIG_CLASS
-NM_IS_DHCP4_CONFIG_CLASS
+

+
+

+nm-dhcp6-config
+NMDHCP6Config
+NMDHCP6Config
+NMDHCP6ConfigClass
+NM_DHCP6_CONFIG_OPTIONS
+nm_dhcp6_config_get_one_option
+nm_dhcp6_config_get_options
+nm_dhcp6_config_new
+
+NM_DHCP6_CONFIG
+NM_DHCP6_CONFIG_CLASS
+NM_IS_DHCP6_CONFIG
+NM_IS_DHCP6_CONFIG_CLASS
+NM_TYPE_DHCP6_CONFIG
+nm_dhcp6_config_get_type
+

+
+

+nm-ip4-config
+NMIP4Config
+NMIP4Config
+NMIP4ConfigClass
+NM_IP4_CONFIG_ADDRESSES
+NM_IP4_CONFIG_DOMAINS
+NM_IP4_CONFIG_NAMESERVERS
+NM_IP4_CONFIG_ROUTES
+NM_IP4_CONFIG_WINS_SERVERS
+nm_ip4_config_get_addresses
+nm_ip4_config_get_domains
+nm_ip4_config_get_nameservers
+nm_ip4_config_get_routes
+nm_ip4_config_get_wins_servers
+nm_ip4_config_new
+
+NM_IP4_CONFIG
+NM_IP4_CONFIG_CLASS
+NM_IP4_CONFIG_GET_CLASS
+NM_IS_IP4_CONFIG
+NM_IS_IP4_CONFIG_CLASS
+NM_TYPE_IP4_CONFIG
+nm_ip4_config_get_type
+

+
+

+nm-ip6-config
+NMIP6Config
+NMIP6Config
+NMIP6ConfigClass
+NM_IP6_CONFIG_ADDRESSES
+NM_IP6_CONFIG_DOMAINS
+NM_IP6_CONFIG_NAMESERVERS
+NM_IP6_CONFIG_ROUTES
+nm_ip6_config_get_addresses
+nm_ip6_config_get_domains
+nm_ip6_config_get_nameservers
+nm_ip6_config_get_routes
+nm_ip6_config_new
+
+NM_IP6_CONFIG
+NM_IP6_CONFIG_CLASS
+NM_IP6_CONFIG_GET_CLASS
+NM_IS_IP6_CONFIG
+NM_IS_IP6_CONFIG_CLASS
+NM_TYPE_IP6_CONFIG
+nm_ip6_config_get_type
+

+
+

+nm-object
+NMObject
+NMObject
+NMObjectClass
+NM_OBJECT_DBUS_CONNECTION
+NM_OBJECT_DBUS_PATH
+nm_object_get_connection
+nm_object_get_path
+
+NM_IS_OBJECT
+NM_IS_OBJECT_CLASS
+NM_OBJECT
+NM_OBJECT_CLASS
+NM_OBJECT_GET_CLASS
+NM_TYPE_OBJECT
+nm_object_get_type
 

 
 

 nm-remote-connection
 NMRemoteConnection
-NM_REMOTE_CONNECTION_UPDATED
-NM_REMOTE_CONNECTION_REMOVED
 NMRemoteConnection
 NMRemoteConnectionClass
 NMRemoteConnectionCommitFunc
 NMRemoteConnectionDeleteFunc
 NMRemoteConnectionGetSecretsFunc
-nm_remote_connection_new
+NM_REMOTE_CONNECTION_REMOVED
+NM_REMOTE_CONNECTION_UPDATED
 nm_remote_connection_commit_changes
 nm_remote_connection_delete
 nm_remote_connection_get_secrets
+nm_remote_connection_new
 
-NM_REMOTE_CONNECTION
 NM_IS_REMOTE_CONNECTION
-NM_TYPE_REMOTE_CONNECTION
-nm_remote_connection_get_type
-NM_REMOTE_CONNECTION_CLASS
 NM_IS_REMOTE_CONNECTION_CLASS
+NM_REMOTE_CONNECTION
+NM_REMOTE_CONNECTION_CLASS
 NM_REMOTE_CONNECTION_GET_CLASS
+NM_TYPE_REMOTE_CONNECTION
+nm_remote_connection_get_type
 

 
 

-nm-types
-NM_TYPE_SSID
-nm_ssid_get_type
-NM_TYPE_UINT_ARRAY
-nm_uint_array_get_type
-NM_TYPE_STRING_ARRAY
-nm_string_array_get_type
-NM_TYPE_OBJECT_ARRAY
-nm_object_array_get_type
-NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY
-nm_ip6_address_object_array_get_type
-NM_TYPE_IP6_ADDRESS_ARRAY
-nm_ip6_address_array_get_type
-NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
-nm_ip6_route_object_array_get_type
+nm-remote-settings
+NMRemoteSettings
+NMRemoteSettings
+NMRemoteSettingsAddConnectionFunc
+NMRemoteSettingsClass
+NMRemoteSettingsError
+NMRemoteSettingsSaveHostnameFunc
+NM_REMOTE_SETTINGS_BUS
+NM_REMOTE_SETTINGS_CAN_MODIFY
+NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NM_REMOTE_SETTINGS_HOSTNAME
+NM_REMOTE_SETTINGS_NEW_CONNECTION
+NM_REMOTE_SETTINGS_SERVICE_RUNNING
+nm_remote_settings_add_connection
+nm_remote_settings_error_quark
+nm_remote_settings_get_connection_by_path
+nm_remote_settings_get_connection_by_uuid
+nm_remote_settings_list_connections
+nm_remote_settings_new
+nm_remote_settings_save_hostname
+
+NM_IS_REMOTE_SETTINGS
+NM_IS_REMOTE_SETTINGS_CLASS
+NM_REMOTE_SETTINGS
+NM_REMOTE_SETTINGS_CLASS
+NM_REMOTE_SETTINGS_ERROR
+NM_REMOTE_SETTINGS_GET_CLASS
+NM_TYPE_REMOTE_SETTINGS
+NM_TYPE_REMOTE_SETTINGS_ERROR
+nm_remote_settings_error_get_type
+nm_remote_settings_get_type
+

+
+

+nm-secret-agent
+NMSecretAgent
+NMSecretAgent
+NMSecretAgentClass
+NMSecretAgentDeleteSecretsFunc
+NMSecretAgentError
+NMSecretAgentGetSecretsFlags
+NMSecretAgentGetSecretsFunc
+NMSecretAgentSaveSecretsFunc
+NM_SECRET_AGENT_AUTO_REGISTER
+NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_REGISTRATION_RESULT
+nm_secret_agent_delete_secrets
+nm_secret_agent_error_quark
+nm_secret_agent_get_secrets
+nm_secret_agent_register
+nm_secret_agent_save_secrets
+nm_secret_agent_unregister
+
+NM_IS_SECRET_AGENT
+NM_IS_SECRET_AGENT_CLASS
+NM_SECRET_AGENT
+NM_SECRET_AGENT_CLASS
+NM_SECRET_AGENT_ERROR
+NM_SECRET_AGENT_GET_CLASS
+NM_TYPE_SECRET_AGENT
+NM_TYPE_SECRET_AGENT_ERROR
+nm_secret_agent_error_get_type
+nm_secret_agent_get_type
 

 
 

 nm-secret-agent-glue
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER
+dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER
+dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER
+dbus_glib_nm_secret_agent_object_info
 g_marshal_value_peek_boolean
+g_marshal_value_peek_boxed
 g_marshal_value_peek_char
-g_marshal_value_peek_uchar
-g_marshal_value_peek_int
-g_marshal_value_peek_uint
-g_marshal_value_peek_long
-g_marshal_value_peek_ulong
-g_marshal_value_peek_int64
-g_marshal_value_peek_uint64
+g_marshal_value_peek_double
 g_marshal_value_peek_enum
 g_marshal_value_peek_flags
 g_marshal_value_peek_float
-g_marshal_value_peek_double
-g_marshal_value_peek_string
+g_marshal_value_peek_int
+g_marshal_value_peek_int64
+g_marshal_value_peek_long
+g_marshal_value_peek_object
 g_marshal_value_peek_param
-g_marshal_value_peek_boxed
 g_marshal_value_peek_pointer
-g_marshal_value_peek_object
+g_marshal_value_peek_string
+g_marshal_value_peek_uchar
+g_marshal_value_peek_uint
+g_marshal_value_peek_uint64
+g_marshal_value_peek_ulong
 g_marshal_value_peek_variant
-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER
-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER
-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER
-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER
-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER
-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER
+

+
+

+nm-types
+
+NM_TYPE_IP6_ADDRESS_ARRAY
+NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY
+NM_TYPE_IP6_ROUTE_OBJECT_ARRAY
+NM_TYPE_OBJECT_ARRAY
+NM_TYPE_SSID
+NM_TYPE_STRING_ARRAY
+NM_TYPE_UINT_ARRAY
+nm_ip6_address_array_get_type
+nm_ip6_address_object_array_get_type
+nm_ip6_route_object_array_get_type
+nm_object_array_get_type
+nm_ssid_get_type
+nm_string_array_get_type
+nm_uint_array_get_type
+

+
+

+nm-vpn-connection
+NMVPNConnection
+NMVPNConnection
+NMVPNConnectionClass
+NM_VPN_CONNECTION_BANNER
+NM_VPN_CONNECTION_VPN_STATE
+nm_vpn_connection_get_banner
+nm_vpn_connection_get_vpn_state
+nm_vpn_connection_new
+
+NM_IS_VPN_CONNECTION
+NM_IS_VPN_CONNECTION_CLASS
+NM_TYPE_VPN_CONNECTION
+NM_VPN_CONNECTION
+NM_VPN_CONNECTION_CLASS
+NM_VPN_CONNECTION_GET_CLASS
+nm_vpn_connection_get_type
+

+
+

+nm-vpn-plugin
+NMVPNPlugin
+NMVPNPlugin
+NMVPNPluginClass
+NMVPNPluginError
+NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+NM_VPN_PLUGIN_STATE
+nm_vpn_plugin_disconnect
+nm_vpn_plugin_error_quark
+nm_vpn_plugin_failure
+nm_vpn_plugin_get_connection
+nm_vpn_plugin_get_state
+nm_vpn_plugin_set_ip4_config
+nm_vpn_plugin_set_login_banner
+nm_vpn_plugin_set_state
+
+NM_IS_VPN_PLUGIN
+NM_IS_VPN_PLUGIN_CLASS
+NM_TYPE_VPN_PLUGIN
+NM_TYPE_VPN_PLUGIN_ERROR
+NM_VPN_PLUGIN
+NM_VPN_PLUGIN_CLASS
+NM_VPN_PLUGIN_ERROR
+NM_VPN_PLUGIN_GET_CLASS
+nm_vpn_plugin_error_get_type
+nm_vpn_plugin_get_type
+

+
+

+nm-vpn-plugin-ui-interface
+NMVpnPluginUi
+NMVpnPluginUiWidget
+NMVpnPluginUiFactory
+NMVpnPluginUiInterface
+NMVpnPluginUiInterfaceProp
+NMVpnPluginUiWidgetInterface
+NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
+NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
+NM_VPN_PLUGIN_UI_CAPABILITY_NONE
+NM_VPN_PLUGIN_UI_INTERFACE_DESC
+NM_VPN_PLUGIN_UI_INTERFACE_NAME
+NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
+nm_vpn_plugin_ui_factory
+nm_vpn_plugin_ui_interface_delete_connection
+nm_vpn_plugin_ui_interface_export
+nm_vpn_plugin_ui_interface_get_capabilities
+nm_vpn_plugin_ui_interface_get_suggested_name
+nm_vpn_plugin_ui_interface_import
+nm_vpn_plugin_ui_interface_ui_factory
+nm_vpn_plugin_ui_widget_interface_get_widget
+nm_vpn_plugin_ui_widget_interface_save_secrets
+nm_vpn_plugin_ui_widget_interface_update_connection
+
+NM_IS_VPN_PLUGIN_UI_INTERFACE
+NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
+NM_TYPE_VPN_PLUGIN_UI_INTERFACE
+NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE
+NM_VPN_PLUGIN_UI_INTERFACE
+NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE
+NM_VPN_PLUGIN_UI_WIDGET_INTERFACE
+NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE
+nm_vpn_plugin_ui_interface_get_type
+nm_vpn_plugin_ui_widget_interface_get_type
 

 
 

 nm-vpn-plugin-utils
-nm_vpn_plugin_utils_read_vpn_details
 nm_vpn_plugin_utils_get_secret_flags
+nm_vpn_plugin_utils_read_vpn_details
+

+
+

+nm-wimax-nsp
+NMWimaxNsp
+NMWimaxNsp
+NMWimaxNspClass
+NMWimaxNspNetworkType
+NM_WIMAX_NSP_NAME
+NM_WIMAX_NSP_NETWORK_TYPE
+NM_WIMAX_NSP_SIGNAL_QUALITY
+nm_wimax_nsp_connection_valid
+nm_wimax_nsp_filter_connections
+nm_wimax_nsp_get_name
+nm_wimax_nsp_get_network_type
+nm_wimax_nsp_get_signal_quality
+nm_wimax_nsp_new
+
+NM_IS_WIMAX_NSP
+NM_IS_WIMAX_NSP_CLASS
+NM_TYPE_WIMAX_NSP
+NM_WIMAX_NSP
+NM_WIMAX_NSP_CLASS
+NM_WIMAX_NSP_GET_CLASS
+nm_wimax_nsp_get_type
 

 
diff --git a/docs/libnm-glib/libnm-glib.png b/docs/libnm-glib/libnm-glib.png
new file mode 100644
index 00000000..dc000728
Binary files /dev/null and b/docs/libnm-glib/libnm-glib.png differ
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
new file mode 100644
index 00000000..8f3eba73
--- /dev/null
+++ b/docs/libnm-glib/libnm-glib.types
@@ -0,0 +1,39 @@
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+nm_client_get_type
+nm_object_get_type
+nm_device_get_type
+nm_device_ethernet_get_type
+nm_device_wifi_get_type
+nm_device_modem_get_type
+nm_device_bt_get_type
+nm_device_wimax_get_type
+nm_wimax_nsp_get_type
+nm_access_point_get_type
+nm_ip4_config_get_type
+nm_ip6_config_get_type
+nm_active_connection_get_type
+nm_dhcp4_config_get_type
+nm_dhcp6_config_get_type
+nm_remote_settings_get_type
+nm_remote_connection_get_type
+nm_secret_agent_get_type
+nm_vpn_connection_get_type
+
diff --git a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml b/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
new file mode 100644
index 00000000..ed0710b9
--- /dev/null
+++ b/docs/libnm-glib/tmpl/libnm_glib.sgml
@@ -0,0 +1,24 @@
+
+libnm_glib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
new file mode 100644
index 00000000..41cade52
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -0,0 +1,283 @@
+
+NMAccessPoint
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@ap: 
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@connections: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@ap: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
new file mode 100644
index 00000000..dedfad8e
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -0,0 +1,195 @@
+
+NMActiveConnection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
new file mode 100644
index 00000000..b8d80874
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -0,0 +1,482 @@
+
+NMClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmclient: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+@nmclient: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+@nmclient: the object which received the signal.
+@arg1: 
+@arg2: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@client: 
+@active_connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@client: 
+@connection: 
+@new_connection_path: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@parent: 
+@device_added: 
+@device_removed: 
+@permission_changed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_CLIENT_PERMISSION_NONE: 
+@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
+@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
+@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
+@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: 
+@NM_CLIENT_PERMISSION_SLEEP_WAKE: 
+@NM_CLIENT_PERMISSION_NETWORK_CONTROL: 
+@NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: 
+@NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: 
+@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: 
+@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: 
+@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: 
+@NM_CLIENT_PERMISSION_LAST: 
+
+
+
+
+
+
+@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
+@NM_CLIENT_PERMISSION_RESULT_YES: 
+@NM_CLIENT_PERMISSION_RESULT_AUTH: 
+@NM_CLIENT_PERMISSION_RESULT_NO: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@client: 
+@connection: 
+@device: 
+@specific_object: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@client: 
+@partial: 
+@device: 
+@specific_object: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@client: 
+@active: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@iface: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@object_path: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@permission: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@enabled: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@sleep: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@enabled: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@enabled: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@enabled: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
new file mode 100644
index 00000000..9f4ad2b7
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -0,0 +1,116 @@
+
+NMDeviceBt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
new file mode 100644
index 00000000..2932ba06
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -0,0 +1,137 @@
+
+NMDeviceEthernet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
new file mode 100644
index 00000000..9d855579
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -0,0 +1,85 @@
+
+NMDeviceModem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
new file mode 100644
index 00000000..1bfe346e
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -0,0 +1,216 @@
+
+NMDeviceWifi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmdevicewifi: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+@nmdevicewifi: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@access_point_added: 
+@access_point_removed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@path: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
new file mode 100644
index 00000000..220bf560
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -0,0 +1,231 @@
+
+NMDeviceWimax
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmdevicewimax: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+@nmdevicewimax: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@nsp_added: 
+@nsp_removed: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@wimax: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@wimax: 
+@Returns: 
+
+
+
+
+
+
+
+@wimax: 
+@path: 
+@Returns: 
+
+
+
+
+
+
+
+@wimax: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
new file mode 100644
index 00000000..0810f93a
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -0,0 +1,441 @@
+
+NMDevice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmdevice: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@state_changed: 
+@connection_valid: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@device: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@device: 
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@device: 
+@connections: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
new file mode 100644
index 00000000..cef5854d
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -0,0 +1,84 @@
+
+NMDHCP4Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+@config: 
+@option: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@object_path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
new file mode 100644
index 00000000..2c113261
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -0,0 +1,84 @@
+
+NMDHCP6Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+@config: 
+@option: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@object_path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
new file mode 100644
index 00000000..e015c2af
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -0,0 +1,158 @@
+
+NMIP4Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@object_path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
new file mode 100644
index 00000000..f098e022
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -0,0 +1,137 @@
+
+NMIP6Config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@config: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@object_path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
new file mode 100644
index 00000000..eb07c0da
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -0,0 +1,85 @@
+
+NMObject
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@object: 
+@Returns: 
+
+
+
+
+
+
+
+@object: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
new file mode 100644
index 00000000..40a745c8
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -0,0 +1,163 @@
+
+NMRemoteConnection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmremoteconnection: the object which received the signal.
+
+
+
+
+
+
+@nmremoteconnection: the object which received the signal.
+
+
+
+
+
+
+@nmremoteconnection: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent_class: 
+@updated: 
+@removed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@connection: 
+@secrets: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@connection: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@connection: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@connection: 
+@setting_name: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@bus: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
new file mode 100644
index 00000000..a300d9b9
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -0,0 +1,223 @@
+
+NMRemoteSettings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmremotesettings: the object which received the signal.
+
+
+
+
+
+
+@nmremotesettings: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@settings: 
+@connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@parent: 
+@new_connection: 
+@connections_read: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
+
+
+
+
+
+
+@settings: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@settings: 
+@connection: 
+@callback: 
+@user_data: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@settings: 
+@path: 
+@Returns: 
+
+
+
+
+
+
+
+@settings: 
+@uuid: 
+@Returns: 
+
+
+
+
+
+
+
+@settings: 
+@Returns: 
+
+
+
+
+
+
+
+@bus: 
+@Returns: 
+
+
+
+
+
+
+
+@settings: 
+@hostname: 
+@callback: 
+@user_data: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
new file mode 100644
index 00000000..c4706cbf
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
@@ -0,0 +1,242 @@
+
+nm-secret-agent-glue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
+
+
+
+
+
+@v: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
new file mode 100644
index 00000000..7cacb703
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -0,0 +1,205 @@
+
+NMSecretAgent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmsecretagent: the object which received the signal.
+@arg1: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@get_secrets: 
+@cancel_get_secrets: 
+@save_secrets: 
+@delete_secrets: 
+@registration_result: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@agent: 
+@connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
+@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
+@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
+@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
+@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: 
+@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
+
+
+
+
+
+
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
+
+
+
+
+
+
+@agent: 
+@connection: 
+@secrets: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+@agent: 
+@connection: 
+@error: 
+@user_data: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@self: 
+@connection: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@connection: 
+@setting_name: 
+@hints: 
+@flags: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
+
+
+
+
+
+@self: 
+@connection: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@self: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
new file mode 100644
index 00000000..18babb0f
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-types.sgml
@@ -0,0 +1,24 @@
+
+nm-types
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
new file mode 100644
index 00000000..3086909a
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -0,0 +1,105 @@
+
+NMVPNConnection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nmvpnconnection: the object which received the signal.
+@arg1: 
+@arg2: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@vpn_state_changed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@vpn: 
+@Returns: 
+
+
+
+
+
+
+
+@vpn: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
new file mode 100644
index 00000000..70889355
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -0,0 +1,219 @@
+
+NMVpnPluginUiWidget
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@g_iface: 
+@ui_factory: 
+@get_capabilities: 
+@import_from_file: 
+@export_to_file: 
+@get_suggested_name: 
+@delete_connection: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
+
+
+
+
+
+
+@g_iface: 
+@get_widget: 
+@update_connection: 
+@save_secrets: 
+@changed: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@connection: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@path: 
+@connection: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@path: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@connection: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@connection: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@iface: 
+@connection: 
+@error: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
new file mode 100644
index 00000000..ed0ab40b
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -0,0 +1,46 @@
+
+nm-vpn-plugin-utils
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@data: 
+@secret_name: 
+@out_flags: 
+@Returns: 
+
+
+
+
+
+
+
+@fd: 
+@out_data: 
+@out_secrets: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
new file mode 100644
index 00000000..b6b95132
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -0,0 +1,154 @@
+
+NMVPNPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+
+
+
+
+
+
+@parent: 
+@connect: 
+@need_secrets: 
+@disconnect: 
+@state_changed: 
+@ip4_config: 
+@login_banner: 
+@failure: 
+@quit: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_VPN_PLUGIN_ERROR_GENERAL: 
+@NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: 
+@NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: 
+@NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: 
+@NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: 
+@NM_VPN_PLUGIN_ERROR_WRONG_STATE: 
+@NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: 
+@NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
+@NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@plugin: 
+@err: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@plugin: 
+@reason: 
+
+
+
+
+
+
+
+@plugin: 
+@Returns: 
+
+
+
+
+
+
+
+@plugin: 
+@Returns: 
+
+
+
+
+
+
+
+@plugin: 
+@ip4_config: 
+
+
+
+
+
+
+
+@plugin: 
+@banner: 
+
+
+
+
+
+
+
+@plugin: 
+@state: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
new file mode 100644
index 00000000..f5dca7a3
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -0,0 +1,146 @@
+
+NMWimaxNsp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
+
+
+
+
+@NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: 
+@NM_WIMAX_NSP_NETWORK_TYPE_HOME: 
+@NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
+@NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@nsp: 
+@connection: 
+@Returns: 
+
+
+
+
+
+
+
+@nsp: 
+@connections: 
+@Returns: 
+
+
+
+
+
+
+
+@nsp: 
+@Returns: 
+
+
+
+
+
+
+
+@nsp: 
+@Returns: 
+
+
+
+
+
+
+
+@nsp: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
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: 
+
+
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index a7a04ce9..03e238b1 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -156,6 +156,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@
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index 2d10c11d..1a220537 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -202,6 +202,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@
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index d52d61b1..6887f168 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -159,6 +159,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@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 735b9665..243af5ec 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -155,6 +155,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@
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index 59f379e3..5231cef8 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -115,6 +115,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@
diff --git a/gtk-doc.make b/gtk-doc.make
index f5c53c7a..1f75dfdc 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -30,11 +30,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 	 \
@@ -75,38 +76,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
@@ -116,8 +122,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 \
@@ -135,7 +141,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 \
@@ -150,13 +156,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" || \
@@ -168,49 +180,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)"; \
@@ -219,14 +237,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
@@ -251,14 +267,14 @@ dist-check-gtkdoc:
 endif
 
 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/include/Makefile.in b/include/Makefile.in
index 27d7ad02..e10ca22c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -142,6 +142,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@
diff --git a/include/nm-version.h b/include/nm-version.h
index b893219d..b7b6ca2e 100644
--- a/include/nm-version.h
+++ b/include/nm-version.h
@@ -43,7 +43,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (1)
+#define NM_MICRO_VERSION (2)
 
 /**
  * NM_CHECK_VERSION:
diff --git a/initscript/Arch/Makefile.in b/initscript/Arch/Makefile.in
index 3b7349d4..719b4f29 100644
--- a/initscript/Arch/Makefile.in
+++ b/initscript/Arch/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/Debian/Makefile.in b/initscript/Debian/Makefile.in
index 73daae51..fe9ef4dc 100644
--- a/initscript/Debian/Makefile.in
+++ b/initscript/Debian/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/Gentoo/Makefile.in b/initscript/Gentoo/Makefile.in
index dd92b10e..bf6ff5b6 100644
--- a/initscript/Gentoo/Makefile.in
+++ b/initscript/Gentoo/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/Makefile.in b/initscript/Makefile.in
index becf7c4b..008f92a8 100644
--- a/initscript/Makefile.in
+++ b/initscript/Makefile.in
@@ -165,6 +165,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@
diff --git a/initscript/Mandriva/Makefile.in b/initscript/Mandriva/Makefile.in
index f0412c2a..4a07d5f4 100644
--- a/initscript/Mandriva/Makefile.in
+++ b/initscript/Mandriva/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/RedHat/Makefile.in b/initscript/RedHat/Makefile.in
index 2329b6e0..50e0d3c4 100644
--- a/initscript/RedHat/Makefile.in
+++ b/initscript/RedHat/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/SUSE/Makefile.in b/initscript/SUSE/Makefile.in
index bbc5a8a6..4a6383c2 100644
--- a/initscript/SUSE/Makefile.in
+++ b/initscript/SUSE/Makefile.in
@@ -116,6 +116,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@
diff --git a/initscript/Slackware/Makefile.in b/initscript/Slackware/Makefile.in
index 8a84419c..6c7ef59a 100644
--- a/initscript/Slackware/Makefile.in
+++ b/initscript/Slackware/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/linexa/Makefile.in b/initscript/linexa/Makefile.in
index de30d93a..a82fcd15 100644
--- a/initscript/linexa/Makefile.in
+++ b/initscript/linexa/Makefile.in
@@ -140,6 +140,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@
diff --git a/initscript/paldo/Makefile.in b/initscript/paldo/Makefile.in
index c2a53bdf..309cf11b 100644
--- a/initscript/paldo/Makefile.in
+++ b/initscript/paldo/Makefile.in
@@ -140,6 +140,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@
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index a92e5793..9e74d391 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -116,6 +116,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@
diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in
index 513c607f..cbfa06f4 100644
--- a/libnm-glib/Makefile.in
+++ b/libnm-glib/Makefile.in
@@ -311,6 +311,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@
diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in
index d3c3ecaa..0fcd5f86 100644
--- a/libnm-glib/tests/Makefile.in
+++ b/libnm-glib/tests/Makefile.in
@@ -151,6 +151,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@
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index 188b0a5e..69af0cfb 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -277,6 +277,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@
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index b8aa1791..26711238 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -213,6 +213,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@
diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in
index b0fbee9e..d7f48d21 100644
--- a/libnm-util/tests/certs/Makefile.in
+++ b/libnm-util/tests/certs/Makefile.in
@@ -124,6 +124,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@
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index 2cfa1e71..0ada1519 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -6,6 +6,7 @@ dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
@@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
                         AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+    dnl don't check for glib if we build glib
+    if test "x$PACKAGE_NAME" != "xglib"; then
+      dnl don't fail if someone does not have glib
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+    fi
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
diff --git a/man/Makefile.in b/man/Makefile.in
index dd6dfdf6..6171271c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -148,6 +148,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@
diff --git a/marshallers/Makefile.in b/marshallers/Makefile.in
index 5901c3a4..de9ff3e5 100644
--- a/marshallers/Makefile.in
+++ b/marshallers/Makefile.in
@@ -146,6 +146,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@
diff --git a/po/fr.po b/po/fr.po
index 374f1b6c..b56bf3ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,973 +1,1200 @@
-# translation of fr.po to French
 # French translation of NetworkManager.
-# Copyright (C) 2004-2008 The GNOME Foundation.
+# Copyright (C) 2004-2011 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager package.
 #
-#
 # Raphaël Tournoy , 2004.
 # Stéphane Raimbault , 2006-2008.
 # Jonathan Ernst , 2007.
 # Robert-André Mauchin , 2007-2008.
 # Sam Friedmann , 2010.
+# Claude Paroz , 2011
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-24 03:25+0000\n"
 "PO-Revision-Date: 2010-05-07 15:23+1000\n"
-"Last-Translator: Sam Friedmann \n"
-"Language-Team: French \n"
+"Last-Translator: Claude Paroz \n"
+"Language-Team: French \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:114 ../cli/src/devices.c:124
+#: ../cli/src/devices.c:134 ../cli/src/devices.c:148 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:173 ../cli/src/devices.c:184 ../cli/src/devices.c:193
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:224
 msgid "NAME"
 msgstr "NOM"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:66
 msgid "DEVICES"
 msgstr "PÉRIPHÉRIQUES"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "ÉTENDUE"
-
-#. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:67
 msgid "DEFAULT"
-msgstr "DÉFAUT"
+msgstr "PAR DÉFAUT"
 
-#. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-SERVICE"
-
-#. 5
-#: ../cli/src/connections.c:65
+#. 3
+#: ../cli/src/connections.c:68
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 4
+#: ../cli/src/connections.c:69
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:70 ../cli/src/connections.c:85
+#: ../cli/src/devices.c:69 ../cli/src/devices.c:214 ../cli/src/devices.c:230
+msgid "DBUS-PATH"
+msgstr "CHEMIN DBUS"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
 msgid "TYPE"
 msgstr "TYPE"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:82
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#: ../cli/src/connections.c:83
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:84
 msgid "READONLY"
-msgstr "READONLY"
+msgstr "LECT. SEULE"
 
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:153
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
+"  list [id  | uuid ]\n"
 "  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Utilisation : nmcli con { COMMANDE | help }\n"
+"  COMMANDE := { list | status | up | down }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
+"  list [id  | uuid ]\n"
 "  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
-"]\n"
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:208 ../cli/src/connections.c:532
 #, c-format
 msgid "Error: 'con list': %s"
-msgstr "Erreur: 'con list': %s"
+msgstr "Erreur : « con list » : %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:210 ../cli/src/connections.c:534
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "Erreur: 'con list': %s; champs autorisés: %s"
+msgstr "Erreur : « con list » : %s ; champs autorisés : %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:218
 msgid "Connection details"
 msgstr "Détails de connexion"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "système"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "utilisateur"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:407
 msgid "never"
 msgstr "jamais"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
+#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
+#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
+#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
+#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
+#: ../cli/src/settings.c:632 ../cli/src/settings.c:753
+#: ../cli/src/settings.c:1041 ../cli/src/settings.c:1042
+#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046
+#: ../cli/src/settings.c:1047 ../cli/src/settings.c:1177
+#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179
+#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1259
+#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
+#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
+#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
+#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
+#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
+#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
+#: ../cli/src/settings.c:1346
 msgid "yes"
 msgstr "oui"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
+#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
+#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
+#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
+#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
+#: ../cli/src/settings.c:562 ../cli/src/settings.c:632
+#: ../cli/src/settings.c:753 ../cli/src/settings.c:1041
+#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1044
+#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1047
+#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178
+#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180
+#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260
+#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
+#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
+#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
+#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
+#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
+#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1346
 msgid "no"
 msgstr "non"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-msgstr "Connexions système"
+#: ../cli/src/connections.c:483
+msgid "Connection list"
+msgstr "Liste des connexions"
 
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
-msgid "User connections"
-msgstr "Connexions utilisateur"
-
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:496 ../cli/src/connections.c:1356
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1380
+#: ../cli/src/connections.c:1390 ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1497 ../cli/src/connections.c:1580
+#: ../cli/src/devices.c:1180 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1304 ../cli/src/devices.c:1312
+#: ../cli/src/devices.c:1525 ../cli/src/devices.c:1532
 #, c-format
 msgid "Error: %s argument is missing."
-msgstr "Erreur: l'argument %s est manquant."
+msgstr "Erreur : le paramètre %s est manquant."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:509
 #, c-format
 msgid "Error: %s - no such connection."
-msgstr "Erreur: %s - connexion introuvable."
+msgstr "Erreur : %s - connexion introuvable."
 
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:515 ../cli/src/connections.c:1415
+#: ../cli/src/connections.c:1514 ../cli/src/connections.c:1587
+#: ../cli/src/devices.c:977 ../cli/src/devices.c:1057
+#: ../cli/src/devices.c:1204 ../cli/src/devices.c:1318
+#: ../cli/src/devices.c:1538
 #, c-format
 msgid "Unknown parameter: %s\n"
-msgstr "Paramètre inconnu: %s\n"
+msgstr "Paramètre inconnu : %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:524
 #, c-format
 msgid "Error: no valid parameter specified."
-msgstr "Erreur: aucun paramètre valide spécifié."
+msgstr "Erreur : aucun paramètre valide spécifié."
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:539 ../cli/src/connections.c:1668
+#: ../cli/src/devices.c:1746 ../cli/src/network-manager.c:456
 #, c-format
 msgid "Error: %s."
-msgstr "Erreur: %s."
+msgstr "Erreur : %s."
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:627
 #, c-format
 msgid "Error: 'con status': %s"
-msgstr "Erreur: 'con status': %s"
+msgstr "Erreur : « con status » : %s"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:629
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Erreur: 'con status': %s; champs autorisés: %s"
+msgstr "Erreur : « con status » : %s ; champs autorisés : %s"
+
+#: ../cli/src/connections.c:637 ../cli/src/connections.c:1430
+#: ../cli/src/connections.c:1529 ../cli/src/connections.c:1601
+#: ../cli/src/devices.c:1004 ../cli/src/devices.c:1066
+#: ../cli/src/devices.c:1219 ../cli/src/devices.c:1348
+#: ../cli/src/devices.c:1567
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Erreur : impossible de savoir si NetworkManager fonctionne : %s."
+
+#: ../cli/src/connections.c:641 ../cli/src/connections.c:1434
+#: ../cli/src/connections.c:1533 ../cli/src/connections.c:1605
+#: ../cli/src/devices.c:1008 ../cli/src/devices.c:1070
+#: ../cli/src/devices.c:1223 ../cli/src/devices.c:1352
+#: ../cli/src/devices.c:1571
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Erreur : NetworkManager n'est pas lancé."
 
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:649
 msgid "Active connections"
 msgstr "Connexions actives"
 
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1073
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "aucune connexion active sur le périphérique '%s'"
+msgstr "aucune connexion active sur le périphérique « %s »"
 
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1081
 #, c-format
 msgid "no active connection or device"
-msgstr "aucune connexion active ou périphérique"
+msgstr "aucune connexion ou périphérique actif"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1152
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "périphérique '%s' incompatible avec la connexion '%s'"
+msgstr "périphérique « %s » incompatible avec la connexion « %s »"
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1154
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "aucun périphérique trouvé pour la connexion '%s'"
+msgstr "aucun périphérique trouvé pour la connexion « %s »"
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1165
 msgid "activating"
 msgstr "activation"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1167
 msgid "activated"
 msgstr "activé"
 
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/connections.c:1169 ../cli/src/devices.c:294
+msgid "deactivating"
+msgstr "désactivation"
+
+#: ../cli/src/connections.c:1172 ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1228 ../cli/src/devices.c:298
+#: ../cli/src/devices.c:678 ../cli/src/network-manager.c:111
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
+#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
+#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:513
+#: ../cli/src/utils.c:397
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1181
 msgid "VPN connecting (prepare)"
 msgstr "Connexion VPN (préparation)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1183
 msgid "VPN connecting (need authentication)"
 msgstr "Connexion VPN (authentification requise)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1185
 msgid "VPN connecting"
 msgstr "Connexion VPN"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1187
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connexion VPN (obtention de la configuration IP)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1189
 msgid "VPN connected"
 msgstr "VPN connecté"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1191
 msgid "VPN connection failed"
 msgstr "Échec de la connexion VPN"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1193
 msgid "VPN disconnected"
 msgstr "VPN déconnecté"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1204
 msgid "unknown reason"
 msgstr "raison inconnue"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1206
 msgid "none"
 msgstr "aucun"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1208
 msgid "the user was disconnected"
 msgstr "l'utilisateur a été déconnecté"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1210
 msgid "the base network connection was interrupted"
 msgstr "la connexion réseau de base a été interrompue"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1212
 msgid "the VPN service stopped unexpectedly"
 msgstr "arrêt inattendu du service VPN"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1214
 msgid "the VPN service returned invalid configuration"
 msgstr "le service VPN a retourné une configuration invalide"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1216
 msgid "the connection attempt timed out"
 msgstr "le délai d'attente de la tentative de connexion a été dépassé"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1218
 msgid "the VPN service did not start in time"
 msgstr "le service VPN n'a pas démarré à temps"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1220
 msgid "the VPN service failed to start"
 msgstr "échec du démarrage du service VPN"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1222
 msgid "no valid VPN secrets"
 msgstr "aucun secret VPN valide"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1224
 msgid "invalid VPN secrets"
 msgstr "secrets VPN invalides"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1226
 msgid "the connection was removed"
 msgstr "la connexion a été supprimée"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1240
 #, c-format
 msgid "state: %s\n"
-msgstr "état: %s\n"
+msgstr "état : %s\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1243 ../cli/src/connections.c:1269
 #, c-format
 msgid "Connection activated\n"
 msgstr "Connexion activée\n"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1246
 #, c-format
 msgid "Error: Connection activation failed."
-msgstr "Erreur: Échec de l'activation de la connexion"
+msgstr "Erreur : échec de l'activation de la connexion."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1265
 #, c-format
 msgid "state: %s (%d)\n"
-msgstr "état: %s (%d)\n"
+msgstr "état : %s (%d)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1275
 #, c-format
 msgid "Error: Connection activation failed: %s."
-msgstr "Erreur: L'activation de la connexion a échoué: %s."
+msgstr "Erreur : l'activation de la connexion a échoué : %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1292 ../cli/src/devices.c:1126
 #, c-format
 msgid "Error: Timeout %d sec expired."
-msgstr "Erreur: Le délai d'attente de %d sec a expiré."
+msgstr "Erreur : le délai d'attente de %d sec a expiré."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1305
 #, c-format
 msgid "Error: Connection activation failed: %s"
-msgstr "Erreur: L'activation de la connexion a échoué: %s"
-
-#: ../cli/src/connections.c:1279
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "Erreur: L'obtention d'une connexion active pour '%s' a échoué."
+msgstr "Erreur : l'activation de la connexion a échoué : %s"
 
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1311
 #, c-format
 msgid "Active connection state: %s\n"
-msgstr "État de connexion active: %s\n"
+msgstr "État de la connexion active : %s\n"
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "Active connection path: %s\n"
-msgstr "État de chemin actif: %s\n"
+msgstr "Chemin de la connection active : %s\n"
 
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1614
 #, c-format
 msgid "Error: Unknown connection: %s."
-msgstr "Erreur: Connexion inconnue: %s."
+msgstr "Erreur : connexion inconnue : %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1410 ../cli/src/devices.c:1198
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
-msgstr "Erreur: Valeur de délai d'attente '%s' invalide."
+msgstr "Erreur : valeur de délai d'attente « %s » non valide."
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1423 ../cli/src/connections.c:1522
+#: ../cli/src/connections.c:1594
 #, c-format
 msgid "Error: id or uuid has to be specified."
-msgstr "Erreur: ID ou UUID doit être spécifié."
+msgstr "Erreur : ID ou UUID doit être spécifié."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1451
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "Erreur: Aucun périphérique convenable trouvé: %s."
+msgstr "Erreur : aucun périphérique convenable trouvé : %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1453
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "Erreur: Aucun périphérique convenable trouvé."
+msgstr "Erreur : aucun périphérique convenable trouvé."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1558
 #, c-format
 msgid "Warning: Connection not active\n"
-msgstr "Avertissement: Connexion inactive\n"
+msgstr "Avertissement : connexion inactive\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1659
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "Erreur: Commande 'con' '%s' invalide."
+msgstr "Erreur : commande « con » « %s » non valide."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1724
 #, c-format
 msgid "Error: could not connect to D-Bus."
-msgstr "Erreur: impossible de connecter à D-Bus."
+msgstr "Erreur : impossible de se connecter à D-Bus."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1732
 #, c-format
 msgid "Error: Could not get system settings."
-msgstr "Erreur: Paramètres système introuvables."
-
-#: ../cli/src/connections.c:1612
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Erreur: Paramètres utilisteur introuvables."
+msgstr "Erreur : impossible d'obtenir les paramètres système."
 
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:1742
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
+msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
-"Erreur: Impossible d'obtenir les connexions: les services des "
-"paramètres ne sont pas en cours d'exécution."
+"Erreur : impossible d'obtenir les connexions : le service des paramètres n'est "
+"pas en cours d'exécution."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
+#: ../cli/src/devices.c:228
 msgid "DEVICE"
 msgstr "PÉRIPHÉRIQUE"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "ÉTAT"
 
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:78
 msgid "GENERAL"
 msgstr "GÉNÉRAL"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:79
 msgid "CAPABILITIES"
-msgstr "CAPABILITÉS"
+msgstr "CAPACITÉS"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:80
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIÉTÉS-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:81
 msgid "AP"
 msgstr "PA"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:82
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIÉTÉS-CABLÉES"
 
 #. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:83
+msgid "WIMAX-PROPERTIES"
+msgstr "PROPRIÉTÉS-WIMAX"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:85
 msgid "IP4-SETTINGS"
 msgstr "PARAMÈTRES-IP4"
 
-#. 5
-#: ../cli/src/devices.c:77
+#. 7
+#: ../cli/src/devices.c:86
 msgid "IP4-DNS"
 msgstr "DNS-IP4"
 
-#. 2
+#. 8
+#: ../cli/src/devices.c:87
+msgid "IP6-SETTINGS"
+msgstr "PARAMÈTRES-IP6"
+
+#. 9
 #: ../cli/src/devices.c:88
+msgid "IP6-DNS"
+msgstr "DNS-IP6"
+
+#. 2
+#: ../cli/src/devices.c:104
 msgid "DRIVER"
 msgstr "PILOTE"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:105
 msgid "HWADDR"
-msgstr "HWADDR"
+msgstr "ADR.-MAT."
 
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:115
 msgid "CARRIER-DETECT"
-msgstr "DÉTECTION-OPÉRATEUR"
+msgstr "DÉTECTION-PORTEUSE"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:116
 msgid "SPEED"
 msgstr "VITESSE"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:125
 msgid "CARRIER"
-msgstr "OPÉRATEUR"
+msgstr "PORTEUSE"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:135
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:136
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:137
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:138
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:139
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:149
+msgid "CTR-FREQ"
+msgstr "FRÉQ-CTR"
+
+#. 1
+#: ../cli/src/devices.c:150
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:151
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:152
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:153
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
 #. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "PREFIX"
 msgstr "PRÉFIXE"
 
 #. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
 msgid "GATEWAY"
 msgstr "PASSERELLE"
 
 #. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:203
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:204
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:205
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:206
 msgid "FREQ"
-msgstr "FREQ"
+msgstr "FRÉQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:207
 msgid "RATE"
 msgstr "DÉBIT"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:209
 msgid "SECURITY"
 msgstr "SÉCURITÉ"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:210
 msgid "WPA-FLAGS"
 msgstr "DRAPEAUX-WPA"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:211
 msgid "RSN-FLAGS"
 msgstr "DRAPEAUX-RSN"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
 msgid "ACTIVE"
 msgstr "ACTIF"
 
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:246
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Utilisation : nmcli dev { COMMANDE | help }\n"
 "\n"
-"  COMMAND := { status | list | disconnect | wifi }\n"
+"  COMMANDE := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMMANDE := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  disconnect iface  [--nowait] [--timeout ]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:274
 msgid "unmanaged"
 msgstr "non-géré"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:276
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:278 ../cli/src/network-manager.c:108
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:280
 msgid "connecting (prepare)"
-msgstr "connexion (préparer)"
+msgstr "connexion (préparation)"
 
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:282
 msgid "connecting (configuring)"
 msgstr "connexion (configuration)"
 
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:284
 msgid "connecting (need authentication)"
 msgstr "connexion (authentification requise)"
 
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:286
 msgid "connecting (getting IP configuration)"
 msgstr "connexion (obtention de la configuration IP)"
 
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:288
+msgid "connecting (checking IP connectivity)"
+msgstr "connexion (contrôle de la connectivité IP)"
+
+#: ../cli/src/devices.c:290
+msgid "connecting (starting secondary connections)"
+msgstr "connexion (démarrage des connexions secondaires)"
+
+#: ../cli/src/devices.c:292 ../cli/src/network-manager.c:104
 msgid "connected"
 msgstr "connecté"
 
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:296
 msgid "connection failed"
 msgstr "échec de la connexion"
 
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:321 ../cli/src/devices.c:331 ../cli/src/devices.c:491
+#: ../cli/src/devices.c:535
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:364
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:389
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: erreur lors de la conversion de l'adresse IP4 0x%X"
+msgstr "%s : erreur lors de la conversion de l'adresse IP4 0x%X"
 
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:460
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:461
 #, c-format
 msgid "%u MB/s"
 msgstr "%u Mo/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:470
 msgid "Encrypted: "
-msgstr "Chiffré: "
+msgstr "Chiffré : "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:475
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:477
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:479
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:482
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:491
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:491
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:526
+msgid "Home"
+msgstr "Domicile"
+
+#: ../cli/src/devices.c:529
+msgid "Partner"
+msgstr "Partenaire"
+
+#: ../cli/src/devices.c:532
+msgid "Roaming"
+msgstr "Itinérance"
+
+#: ../cli/src/devices.c:602
 #, c-format
 msgid "Error: 'dev list': %s"
-msgstr "Erreur: 'dev list': %s"
+msgstr "Erreur : « dev list » : %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:604
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "Erreur: 'dev list': %s; champs autorisés: %s"
+msgstr "Erreur : « dev list » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:613
 msgid "Device details"
-msgstr "Détails périphérique"
+msgstr "Détails de périphérique"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:647 ../cli/src/devices.c:1142 ../cli/src/utils.c:343
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:648
 msgid "unknown)"
 msgstr "inconnu)"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:674
 #, c-format
 msgid "%u Mb/s"
-msgstr "%u Mo/s"
+msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:747
 msgid "on"
 msgstr "marche"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:747
 msgid "off"
 msgstr "arrêt"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:994
 #, c-format
 msgid "Error: 'dev status': %s"
-msgstr "Erreur: 'dev status': %s"
+msgstr "Erreur : « dev status » : %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:996
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Erreur: 'dev status': %s; champs autorisés: %s"
+msgstr "Erreur : « dev status » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1019
 msgid "Status of devices"
-msgstr "Statut des périphériques"
+msgstr "État des périphériques"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:1050
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Erreur: L'argument '%s' est manquant."
+msgstr "Erreur : le paramètre « %s » est manquant."
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1091 ../cli/src/devices.c:1243
+#: ../cli/src/devices.c:1380 ../cli/src/devices.c:1599
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "Erreur: Périphérique '%s' introuvable."
+msgstr "Erreur : périphérique « %s » introuvable."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1114
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "Opération réussie: Périphérique '%s' correctement déconnecté."
+msgstr "Opération réussie : périphérique « %s » correctement déconnecté."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1139
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Erreur: Échec de la déconnexion du périphérique '%s' (%s): %s"
+msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1147
 #, c-format
 msgid "Device state: %d (%s)\n"
-msgstr "État du périphérique: %d (%s)\n"
+msgstr "État du périphérique : %d (%s)\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1212
 #, c-format
 msgid "Error: iface has to be specified."
-msgstr "Erreur: iface doit être spécifié."
+msgstr "Erreur : iface doit être spécifié."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1338
 #, c-format
 msgid "Error: 'dev wifi': %s"
-msgstr "Erreur: 'dev wifi': %s"
+msgstr "Erreur : « dev wifi » : %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1340
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "Erreur: 'dev wifi': %s; champs autorisés: %s"
+msgstr "Erreur : « dev wifi » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1363
 msgid "WiFi scan list"
 msgstr "Liste du balayage WiFi"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1400 ../cli/src/devices.c:1454
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Erreur: Point d'accès avec hwaddr '%s' introuvable."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Erreur : point d'accès avec bssid « %s » introuvable."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1417
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Erreur: Le périphérique '%s' n'est pas un périphérique WiFi."
+msgstr "Erreur : le périphérique « %s » n'est pas un périphérique WiFi."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1481
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "Erreur: Commande 'dev wifi' '%s' invalide."
+msgstr "Erreur : commande « dev wifi » « %s » non valide."
+
+#: ../cli/src/devices.c:1557
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Erreur : « dev wimax » : %s"
+
+#: ../cli/src/devices.c:1559
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Erreur : « dev wimax » : %s ; champs autorisés : %s"
+
+#: ../cli/src/devices.c:1582
+msgid "WiMAX NSP list"
+msgstr "Liste NSP WiMax"
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Erreur : NSP nommé « %s » introuvable."
+
+#: ../cli/src/devices.c:1630
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Erreur : le périphérique « %s » n'est pas un périphérique WiMax."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1661
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Erreur : point d'accès avec nsp « %s » introuvable."
+
+#: ../cli/src/devices.c:1688
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Erreur : commande « dev wifi » « %s » non valide."
+
+#: ../cli/src/devices.c:1738
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "Erreur: Commande 'dev' '%s' invalide."
+msgstr "Erreur : commande « dev » « %s » non valide."
 
-#: ../cli/src/network-manager.c:35
+#
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
-msgstr "EN COURS D'EXÉCUTION"
+msgstr "ÉTAT FONCT."
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERSION"
+
+#. 2
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "RÉSEAU-ACT."
+
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "MATÉRIEL-WIFI"
 
-#. 2
-#: ../cli/src/network-manager.c:38
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
 msgstr "MATÉRIEL-WWAN"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:62
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "MATÉRIEL-WIMAX"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:67
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Usage: nmcli nm { COMMAND | help }\n"
+"Utilisation : nmcli nm { COMMANDE | help }\n"
+"\n"
+"  COMMANDE := { status | enable | sleep | wifi | wwan | wimax }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMANDE := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:96
 msgid "asleep"
 msgstr "veille"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:98
 msgid "connecting"
 msgstr "connexion"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:100
+msgid "connected (local only)"
+msgstr "connecté (local seulement)"
+
+#: ../cli/src/network-manager.c:102
+msgid "connected (site only)"
+msgstr "connecté (site seulement)"
+
+#: ../cli/src/network-manager.c:106
+msgid "disconnecting"
+msgstr "déconnexion"
+
+#: ../cli/src/network-manager.c:146
 #, c-format
 msgid "Error: 'nm status': %s"
-msgstr "Erreur: 'nm status': %s"
+msgstr "Erreur : « nm status » : %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:148
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "Erreur: 'nm status': %s; champs autorisés: %s"
-
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "État de NetworkManager"
-
-#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgstr "Erreur : « nm status » : %s ; champs autorisés : %s"
+
+#. create NMClient
+#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
+#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
+#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
+#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
+#: ../cli/src/network-manager.c:421
 msgid "enabled"
 msgstr "activé"
 
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
+#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
+#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
+#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
+#: ../cli/src/network-manager.c:421
 msgid "disabled"
 msgstr "désactivé"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:181
+msgid "NetworkManager status"
+msgstr "État de NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:184
 msgid "running"
 msgstr "actif"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:184
 msgid "not running"
 msgstr "inactif"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Erreur : impossible de se connecter au bus système : %s"
+
+#: ../cli/src/network-manager.c:226
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Erreur : impossible de créer l'objet proxy D-Bus."
+
+#: ../cli/src/network-manager.c:232
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "Erreur dans la commande sleep : %s"
+
+#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
+#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "Erreur: Valeur '--fields' '%s' est invalide; champs autorisés: %s"
+msgstr ""
+"Erreur : valeur « --fields » « %s » n'est pas valide à cet endroit ; champs "
+"autorisés : %s"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:284
+msgid "Networking enabled"
+msgstr "Réseau activé"
+
+#: ../cli/src/network-manager.c:300
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Erreur : paramètre « enable » non valide : « %s » ; utilisez « true » ou « false »."
+
+#: ../cli/src/network-manager.c:310
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Erreur : l'état de sommeil n'est pas exporté par NetworkManager."
+
+#: ../cli/src/network-manager.c:318
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Erreur : paramètre « sleep » non valide : « %s » ; utilisez « true » ou « false »."
+
+#: ../cli/src/network-manager.c:339
 msgid "WiFi enabled"
 msgstr "WiFi activé"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:355
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "Erreur: Paramètre 'wifi' invalide: '%s'."
+msgstr "Erreur : paramètre « wifi » non valide : « %s »."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:377
 msgid "WWAN enabled"
 msgstr "WWAN activé"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:393
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "Erreur: Paramètre 'wwan' invalide: '%s'."
+msgstr "Erreur : paramètre « wwan » non valide : « %s »."
+
+#: ../cli/src/network-manager.c:416
+msgid "WiMAX enabled"
+msgstr "WiMAX activé"
+
+#: ../cli/src/network-manager.c:432
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Erreur : paramètre « wimax » non valide : « %s »."
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:445
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "Erreur: Commande 'nm' '%s' invalide."
+msgstr "Erreur : commande « nm » « %s » non valide."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -979,6 +1206,8 @@ msgid ""
 "  -f[ields] |all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -988,594 +1217,732 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"Utilisation : %s [OPTIONS] OBJET { COMMANDE | help }\n"
 "\n"
 "OPTIONS\n"
 "  -t[erse]                                   sortie laconique\n"
 "  -p[retty]                                  sortie formatée\n"
 "  -m[ode] tabular|multiline                  mode de sortie\n"
-"  -f[ields] |all|common   spécifie les champs à sortir\n"
-"  -e[scape] yes|no                           échapper les séprateurs de colonnes dans les valeurs\n"
-"  -v[ersion]                                 afficher la version du programme\n"
-"  -h[elp]                                    imprimer l'aide\n"
+"  -f[ields] |all|common   spécifie les champs à afficher\n"
+"  -e[scape] yes|no                           échapper les séparateurs de "
+"colonnes dans les valeurs\n"
+"  -n[ocheck]                                 ne pas vérifier les versions de "
+"nmcli et NetworkManager\n"
+"  -v[ersion]                                 afficher la version du "
+"programme\n"
+"  -h[elp]                                    afficher l'aide\n"
 "\n"
-"OBJECT\n"
-"  nm          statut de NetworkManager\n"
+"OBJET\n"
+"  nm          état de NetworkManager\n"
 "  con         connexions de NetworkManager\n"
 "  dev         périphériques gérés par NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "Erreur: Objet '%s' inconnu, essayez 'nmcli help'."
+msgstr "Erreur : objet « %s » inconnu, essayez « nmcli help »."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "Erreur: Option '--terse' est spécifiée la seconde fois."
+msgstr "Erreur : option « --terse » est spécifiée la seconde fois."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "Erreur: Option '--terse' est mutuellement exclusive avec '--pretty'."
+msgstr "Erreur : option « --terse » mutuellement exclusive avec « --pretty »."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "Erreur: Option '--pretty' est spécifiée la seconde fois."
+msgstr "Erreur : option « --pretty » est spécifiée la seconde fois."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "Erreur: Option '--pretty' est mutuellement exclusive avec '--terse'."
+msgstr "Erreur : option « --pretty » mutuellement exclusive avec « --terse »."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "Erreur: argument manquant pour l'option '%s'."
+msgstr "Erreur : paramètre manquant pour l'option « %s »."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "Erreur: '%s' est un argument invalide pour l'option '%s'."
+msgstr "Erreur : « %s » est n'est pas un paramètre valide pour l'option « %s »."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "Erreur: Les champs pour les options '%s' sont manquants."
+msgstr "Erreur : les champs pour les options « %s » sont manquants."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "outil nmcli, version %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Erreur: Option '%s' inconnue, essayez 'nmcli -help'."
+msgstr "Erreur : option « %s » inconnue, essayez « nmcli -help »."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "Signal %d reçu, arrêt en cours..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Erreur: Impossible de connecter à NetworkManager."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "Erreur : impossible de créer l'objet NMClient."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
-msgstr "Réussite"
+msgstr "Succès"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:447
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:449
 #, c-format
 msgid "%d (104/128-bit passphrase)"
-msgstr "%d (104/128-bit passphrase)"
+msgstr "%d (phrase de passe 104/128-bit)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:452
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (inconnu)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:478
 msgid "0 (unknown)"
 msgstr "0 (inconnu)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:484
 msgid "any, "
-msgstr "any, "
+msgstr "tous, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:486
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:488
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:490
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:492
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:494
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:496
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:498
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:500
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:502
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:504
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:506
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:508
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:510
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:636 ../cli/src/settings.c:835
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:829 ../cli/src/settings.c:832
+#: ../cli/src/settings.c:833 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "non défini"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "champ '%s' doit être seul"
+msgstr "champ « %s » doit être seul"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
-msgstr "champ '%s' invalide"
+msgstr "champ « %s » non valide"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "Option '--terse' requiert la spécification de '--fields'"
+msgstr "L'option « --terse » requiert la spécification de « --fields »"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "Option '--terse' requiert des valeurs d'options '--fields' spécifiques, pas '%s'"
+msgstr ""
+"L'option « --terse » requiert des valeurs d'options « --fields » spécifiques, pas "
+"« %s »"
+
+#: ../cli/src/utils.c:334
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr "Erreur : impossible de créer le proxy d'objet D-Bus pour org.freedesktop.DBus"
+
+#: ../cli/src/utils.c:342
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Erreur : la requête NameHasOwner a échoué : %s"
+
+#: ../cli/src/utils.c:387
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Avertissement : les versions de nmcli (%s) et de NetworkManager (%s) ne "
+"correspondent pas. Utilisez --nocheck pour supprimer cet avertissement.\n"
+
+#: ../cli/src/utils.c:396
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Erreur : les versions de nmcli (%s) et de NetworkManager (%s) ne correspondent "
+"pas. L'exécution peut être forcée avec --nocheck, mais les résultats sont "
+"imprévisibles."
 
-#: ../libnm-util/crypto.c:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "Le fichier de clé PEM n'a pas de balise de fin « %s »."
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Cela ne semble pas être un fichier de clé privée PEM."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "Mémoire insuffisante pour contenir les données du fichier PEM."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Fichier PEM incorrect : Proc-Type n'est pas la première balise."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Fichier PEM incorrect : étiquette Proc-Type « %s » inconnue."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Fichier PEM incorrect : DEK-Info n'est pas la deuxième balise."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Fichier PEM incorrect : aucun IV trouvé dans la balise DEK-Info."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Fichier PEM incorrect : format IV invalide dans la balise DEK-Info."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Fichier PEM incorrect : chiffre de clé privée « %s » inconnu."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "Impossible de décoder la clé privée."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "Le certificat PEM « %s » n'a pas de balise de fin « %s »."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "Impossible de trouver la balise initiale PKCS#8 attendue."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "Impossible de décoder le certificat."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "Impossible de trouver la balise terminale PKCS#8 attendue (« %s »)."
+
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "Mémoire insuffisante pour contenir les données de la clé privée."
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "Le décodage de la clé privée PKCS#8 a échoué."
+
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "Mémoire insuffisante pour contenir les données du certificat."
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "Mémoire insuffisante pour contenir les données du fichier."
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
-msgstr "La longueur en octets d'IV doit être paire."
+msgstr "La longueur en octets de IV doit être paire."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
-msgstr "Mémoire insuffisante pour contenir l'IV."
+msgstr "Mémoire insuffisante pour contenir le IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
-msgstr "L'IV contient des chiffres non-hexadécimaux."
+msgstr "Le IV contient des chiffres non hexadécimaux."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
-#: ../libnm-util/crypto_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Le chiffre « %s » de la clé privée est inconnu."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
+msgstr "Mémoire insuffisante pour déchiffrer la clé privée."
+
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
 msgstr "Mémoire insuffisante pour contenir la clé privée déchiffrée."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Impossible de déterminer le type de la clé privée."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "Mémoire insuffisante pour contenir la clé privée déchiffrée."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "Le certificat PEM n'a pas de balise initiale « %s »."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "Le certificat PEM n'a pas de balise terminale « %s »."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Impossible de décoder le certificat."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "L'initialisation du moteur de chiffrement a échoué."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "L'initialisation du moteur MD5 a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Longueur IV invalide (minimum %zd)."
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "Mémoire insuffisante pour le tampon de clé déchiffrée."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "L'initialisation du contexte du chiffre de déchiffrement a échoué : %s / %s."
+msgstr ""
+"L'initialisation du contexte du chiffre de déchiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "La définition de la clé symétrique pour le déchiffrement a échoué : %s / %s."
+msgstr ""
+"La définition de la clé symétrique pour le déchiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
-msgstr "La définition d'IV pour le déchiffrement a échoué : %s / %s."
+msgstr "La définition de IV pour le déchiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Le déchiffrement de la clé privée a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr ""
-"Le déchiffrement de la clé privée a échoué: Longueur de remplissage "
+"Le déchiffrement de la clé privée a échoué : longueur de remplissage "
 "inattendue."
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Le déchiffrement de la clé privée a échoué."
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Allocation de mémoire pour chiffrement impossible."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr ""
-"L'initialisation du contexte du cryptage de chiffrement a échoué: %s / "
-"%s."
+"L'initialisation du contexte du cryptage de chiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr ""
-"La définition de la clé symétrique pour le chiffrement a échoué: %s / %"
-"s."
+"La définition de la clé symétrique pour le chiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
-msgstr "La définition d'IV pour le chiffrement a échoué: %s / %s."
+msgstr "La définition de IV pour le chiffrement a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
-msgstr "Le chiffrement des données a échoué; %s / %s."
+msgstr "Le chiffrement des données a échoué : %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Erreur lors de l'initialisation des données du certificat : %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Impossible de décoder le certificat : %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "L'initialisation du décodeur PKCS#12 a échoué: %s"
+msgstr "L'initialisation du décodeur PKCS#12 a échoué : %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
-msgstr "Impossible de décoder le fichier PKCS#12: %s"
+msgstr "Impossible de décoder le fichier PKCS#12 : %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
-msgstr "Impossible de vérifier le fichier PKCS#12: %s"
+msgstr "Impossible de vérifier le fichier PKCS#12 : %s"
+
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "L'initialisation du décodeur PKCS#8 a échoué : %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "Impossible de décoder le fichier PKCS#8 : %s"
 
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "L'initialisation du moteur de chiffrement a échoué : %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "L'initialisation du contexte MD5 a échoué : %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "Longueur IV invalide (minimum %d)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
-msgstr "L'initialisation de l'emplacement du chiffre de déchiffrement a échoué."
+msgstr ""
+"L'initialisation de l'emplacement du chiffre de déchiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "La définition de la clé symétrique pour le déchiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
-msgstr "La définition d'IV pour le déchiffrement a échoué."
+msgstr "La définition de IV pour le déchiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "L'initialisation du contexte de déchiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Le déchiffrement de la clé privée a échoué : %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
-"Le déchiffrement de la clé privée a échoué: les données déchiffrées "
-"sont trop longues."
+"Le déchiffrement de la clé privée a échoué : les données déchiffrées sont "
+"trop longues."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "La finalisation du déchiffrement de la clé privée a échoué : %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "La définition de la clé symétrique pour le chiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
-msgstr "La définition d'IV pour le déchiffrement a échoué."
+msgstr "La définition de IV pour le chiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "L'initialisation du contexte de chiffrement a échoué."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "Le chiffrement a échoué : %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "Quantité de données inattendue après chiffrement."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "Impossible de décoder le certificat : %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
-msgstr "Impossible de convertir le mot de passe en UCS2: %d."
+msgstr "Impossible de convertir le mot de passe en UCS2 : %d."
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
-msgstr "Impossible d'initialiser le décodeur PKCS#12: %d"
+msgstr "Impossible d'initialiser le décodeur PKCS#12 : %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
-msgstr "Impossible de décoder le fichier PKCS#12: %d"
+msgstr "Impossible de décoder le fichier PKCS#12 : %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
-msgstr "Impossible de vérifier le fichier PKCS#12: %d"
+msgstr "Impossible de vérifier le fichier PKCS#12 : %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
-msgstr "Impossible des données aléatoires."
+msgstr "Impossible de générer des données aléatoires."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2000
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Mémoire insuffisante pour créer une clé de chiffrement."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2110
 msgid "Could not allocate memory for PEM file creation."
-msgstr "Allocation de mémoire pour la création du fichier PEM impossible."
+msgstr "Allocation de mémoire impossible pour la création du fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2122
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
-msgstr "Allocation de mémoire pour l'écriture d'IV sur le fichier PEM impossible."
+msgstr ""
+"Allocation de mémoire impossible pour l'écriture de IV dans le fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2134
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
-"Allocation de mémoire pour l'écriture de la clé chiffrée sur le fichier PEM "
-"impossible."
+"Allocation de mémoire impossible pour l'écriture de la clé chiffrée dans le "
+"fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2153
 #, c-format
 msgid "Could not allocate memory for PEM file data."
-msgstr "Allocation de mémoire pour les données du fichier PEM impossible."
+msgstr "Allocation de mémoire impossible pour les données du fichier PEM."
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "erreur lors du traitement du message netlink : %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "Autoriser le contrôle des connexions réseau"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "une erreur est survenue pendant l'attente de données sur le connecteur"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Partage de connexion via un réseau WiFi protégé"
 
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "Partage de connexion via un réseau WiFi ouvert"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable WiFi devices"
+msgstr "Activer ou désactiver des périphériques WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Activer ou désactiver des périphériques WiMAX à large bande"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "Enable or disable mobile broadband devices"
+msgstr "Activer ou désactiver des périphériques mobiles à large bande"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable system networking"
+msgstr "Activer ou désactiver le réseau système"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "Modifier les connexions réseau pour tous les utilisateurs"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Modifier le nom d'hôte persistant du système"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "Modifier les connexions du réseau personnel"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
 msgstr ""
-"impossible de se connecter à netlink pour surveiller l'état de la "
-"connexion : %s"
+"Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la "
+"gestion d'énergie du système)"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "impossible d'activer le passage de crédentiels de gestion netlink: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "La politique du système empêche le contrôle des connexions réseau"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
-"impossible d'allouer un gestionnaire netlink pour surveiller l'état de la "
-"connexion : %s"
+"La politique du système empêche l'activation ou la désactivation de "
+"périphériques WiFi"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"impossible d'allouer un cache de connexion netlink pour surveiller l'état de "
-"la connexion : %s"
+"La politique du système empêche l'activation ou la désactivation de "
+"périphériques WiMAX à large bande"
 
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "impossible de joindre le groupe netlink: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"La politique du système empêche l'activation ou la désactivation de "
+"périphériques mobiles à large bande"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "erreur lors de la mise à jour du cache de connexion : %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"La politique du système empêche l'activation ou la désactivation du réseau du "
+"système"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"La politique du système empêche toute modification des paramètres réseau pour "
+"tous les utilisateurs"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr ""
+"La politique du système empêche toute modification des paramètres réseau "
+"personnels"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"La politique du système empêche toute modification du nom d'hôte persistant "
+"du système"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"La politique du système empêche la mise en veille et le réveil de NetworkManager"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"La politique du système empêche tout partage des connexions via un réseau "
+"WiFi protégé"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"La politique du système empêche tout partage des connexions via un réseau "
+"WiFi ouvert"
 
-#: ../src/main.c:502
+#: ../src/main.c:530
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
-"Option non valide.  Utilisez --help pour afficher une liste d'options "
+"Option non valide. Utilisez --help pour afficher une liste d'options "
 "valides.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:611
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s.  Veuillez utiliser --help pour afficher une liste d'options valides.\n"
+msgstr "%s. Utilisez --help pour afficher une liste d'options valides.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Créé par NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1584,87 +1951,130 @@ msgstr ""
 "# Fusionné depuis %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
 msgid "no usable DHCP client could be found."
 msgstr "aucun client DHCP utilisable n'a pu être trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 msgid "'dhclient' could be found."
-msgstr "'dhclient' a été trouvé.be found."
+msgstr "« dhclient » a été trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
 msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' introuvable."
+msgstr "« dhcpcd » a été trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
 #, c-format
 msgid "unsupported DHCP client '%s'"
-msgstr "client DHCP '%s' non pris en charge"
+msgstr "client DHCP « %s » non pris en charge"
 
-#: ../src/logging/nm-logging.c:146
-#, c-format
-msgid "Unknown log level '%s'"
-msgstr "Niveau de journalisation inconnu '%s'"
-
-#: ../src/logging/nm-logging.c:171
-#, c-format
-msgid "Unknown log domain '%s'"
-msgstr "Domaine de journalisation inconnu '%s'"
-
-#: ../src/dns-manager/nm-dns-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:376
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTE : il se peut que le solveur libc ne prenne pas en charge plus de 3 "
 "serveurs de noms."
 
-#: ../src/dns-manager/nm-dns-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:378
 msgid "The nameservers listed below may not be recognized."
 msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/logging/nm-logging.c:149
 #, c-format
-msgid "Auto %s"
-msgstr "Auto %s"
+msgid "Unknown log level '%s'"
+msgstr "Niveau de journalisation « %s » inconnu"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
-msgid "System"
-msgstr "Système"
+#: ../src/logging/nm-logging.c:174
+#, c-format
+msgid "Unknown log domain '%s'"
+msgstr "Domaine de journalisation « %s » inconnu"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Partage de connexion via un réseau WiFi protégé"
+#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#, c-format
+msgid "CDMA connection %d"
+msgstr "Connexion CDMA %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Partage de connexion via un réseau WiFi ouvert"
+#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#, c-format
+msgid "GSM connection %d"
+msgstr "Connexion GSM %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Modifier le nom d'hôte du système persistant"
+#: ../src/nm-device-bt.c:326
+#, c-format
+msgid "PAN connection %d"
+msgstr "Connexion PAN %d"
+
+#: ../src/nm-device-bt.c:359
+#, c-format
+msgid "DUN connection %d"
+msgstr "Connexion DUN %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Modifier les connexions système"
+#: ../src/nm-device-ethernet.c:1724
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "Connexion PPPoE %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "La stratégie du système empêche toute modification des paramètres du système"
+#: ../src/nm-device-ethernet.c:1724 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "Connexion filaire %d"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
+#: ../src/nm-device-olpc-mesh.c:393
+#, c-format
+msgid "Mesh %d"
+msgstr "Réseau maillé %d"
+
+#: ../src/nm-manager.c:670
+#, c-format
+msgid "VPN connection %d"
+msgstr "Connexion VPN %d"
+
+#: ../src/nm-netlink-monitor.c:101 ../src/nm-netlink-monitor.c:234
+#: ../src/nm-netlink-monitor.c:661
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "erreur lors du traitement du message netlink : %s"
+
+#: ../src/nm-netlink-monitor.c:216
+msgid "error occurred while waiting for data on socket"
+msgstr "une erreur est survenue pendant l'attente de données sur le connecteur"
+
+#: ../src/nm-netlink-monitor.c:260
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"La stratégie du système empêche toute modification du nom d'hôte du système "
-"persistant"
+"impossible de se connecter à netlink pour surveiller l'état de la "
+"connexion : %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../src/nm-netlink-monitor.c:271
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "impossible d'activer le passage de crédentiels de gestion netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:294 ../src/nm-netlink-monitor.c:354
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
-"La stratégie du système empêche tout partage des connexions via un réseau "
-"WiFi protégé"
+"impossible d'allouer un gestionnaire netlink pour surveiller l'état de la "
+"connexion : %s"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/nm-netlink-monitor.c:379
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
 msgstr ""
-"La stratégie du système empêche tout partage des connexions via un réseau "
-"WiFi ouvert"
+"impossible d'allouer un cache de connexion netlink pour surveiller l'état de "
+"la connexion : %s"
+
+#: ../src/nm-netlink-monitor.c:506
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "impossible de joindre le groupe netlink : %s"
+
+#: ../src/nm-netlink-monitor.c:637 ../src/nm-netlink-monitor.c:650
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "erreur lors de la mise à jour du cache de connexion : %s"
 
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3575
+#: ../src/settings/plugins/ifnet/connection_parser.c:51
+msgid "System"
+msgstr "Système"
diff --git a/po/it.po b/po/it.po
index 08de0499..0d1041b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,971 +1,1197 @@
-# translation of it.po to
 # Italian translation for NetworkManager
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 THE NetworkManager CopyRight Holder
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 the NetworkManager CopyRight Holder
 # This file is distributed under the same license as the NetworkManager package.
-# Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009.
+# Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009, 2010.
+# Vincenzo Reale , 2011.
+# Milo Casagrande , 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: it\n"
+"Project-Id-Version: network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-07 10:47+1000\n"
-"Last-Translator: \n"
-"Language-Team:  \n"
+"POT-Creation-Date: 2011-10-23 19:22+0200\n"
+"PO-Revision-Date: 2011-10-23 19:09+0200\n"
+"Last-Translator: Milo Casagrande \n"
+"Language-Team: Italian \n"
+"Language: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+"X-Launchpad-Export-Date: 2011-10-23 16:25+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
+
+#: ../cli/src/connections.c:64 ../cli/src/connections.c:78
+#: ../cli/src/devices.c:101 ../cli/src/devices.c:114 ../cli/src/devices.c:124
+#: ../cli/src/devices.c:134 ../cli/src/devices.c:148 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:173 ../cli/src/devices.c:184 ../cli/src/devices.c:193
+#: ../cli/src/devices.c:202 ../cli/src/devices.c:224
 msgid "NAME"
 msgstr "NOME"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:65 ../cli/src/connections.c:79
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:66
 msgid "DEVICES"
 msgstr "DISPOSITIVI"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "SCOPO"
-
-#. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:67
 msgid "DEFAULT"
 msgstr "PREDEFINITO"
 
-#. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "SERVIZIO-DBUS"
-
-#. 5
-#: ../cli/src/connections.c:65
+#. 3
+#: ../cli/src/connections.c:68
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OGGETTO"
 
-#. 6
-#: ../cli/src/connections.c:66
+#. 4
+#: ../cli/src/connections.c:69
 msgid "VPN"
 msgstr "VPN"
 
+#. 5
+#. 6
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:70 ../cli/src/connections.c:85
+#: ../cli/src/devices.c:69 ../cli/src/devices.c:214 ../cli/src/devices.c:230
+msgid "DBUS-PATH"
+msgstr "PERCORSO-DBUS"
+
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:80 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:103 ../cli/src/devices.c:227
 msgid "TYPE"
 msgstr "TIPO"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:81
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:82
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REALE"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#: ../cli/src/connections.c:83
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNESSIONE"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:84
 msgid "READONLY"
 msgstr "SOLO LETTURA"
 
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:153
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
+"  list [id  | uuid ]\n"
 "  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 msgstr ""
-"Utilizzo: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Uso: nmcli con { COMANDO | help }\n"
+"  COMANDO := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
+"  list [id  | uuid ]\n"
 "  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
+"  up id  | uuid  [iface ] [ap ] [nsp ] [--"
+"nowait] [--timeout ]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
 "]\n"
 "  down id  | uuid \n"
+"  delete id  | uuid \n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:208 ../cli/src/connections.c:532
 #, c-format
 msgid "Error: 'con list': %s"
-msgstr "Errore: 'con list': %s"
+msgstr "Errore: \"con list\": %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:210 ../cli/src/connections.c:534
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "Errore: 'con list': %s; campi permessi: %s"
+msgstr "Errore: \"con list\": %s; campi consentiti: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:218
 msgid "Connection details"
 msgstr "Informazioni sulla connessione"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "sistema"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "utente"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:407
 msgid "never"
 msgstr "mai"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
+#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
+#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
+#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
+#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
+#: ../cli/src/settings.c:632 ../cli/src/settings.c:753
+#: ../cli/src/settings.c:1041 ../cli/src/settings.c:1042
+#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046
+#: ../cli/src/settings.c:1047 ../cli/src/settings.c:1177
+#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179
+#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1259
+#: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
+#: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
+#: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
+#: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
+#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
+#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
+#: ../cli/src/settings.c:1346
 msgid "yes"
 msgstr "si"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:408 ../cli/src/connections.c:409
+#: ../cli/src/connections.c:587 ../cli/src/connections.c:589
+#: ../cli/src/devices.c:499 ../cli/src/devices.c:552 ../cli/src/devices.c:677
+#: ../cli/src/devices.c:703 ../cli/src/devices.c:704 ../cli/src/devices.c:705
+#: ../cli/src/devices.c:706 ../cli/src/devices.c:707 ../cli/src/settings.c:560
+#: ../cli/src/settings.c:562 ../cli/src/settings.c:632
+#: ../cli/src/settings.c:753 ../cli/src/settings.c:1041
+#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1044
+#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1047
+#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178
+#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180
+#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260
+#: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
+#: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
+#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
+#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
+#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
+#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1346
 msgid "no"
 msgstr "no"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-msgstr "Connessioni di sistema"
+#: ../cli/src/connections.c:483
+msgid "Connection list"
+msgstr "Elenco connessione"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
-msgid "User connections"
-msgstr "Connessioni utente"
-
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:496 ../cli/src/connections.c:1356
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1380
+#: ../cli/src/connections.c:1390 ../cli/src/connections.c:1402
+#: ../cli/src/connections.c:1497 ../cli/src/connections.c:1580
+#: ../cli/src/devices.c:1180 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1304 ../cli/src/devices.c:1312
+#: ../cli/src/devices.c:1525 ../cli/src/devices.c:1532
 #, c-format
 msgid "Error: %s argument is missing."
-msgstr "Errore: l'argomento %s è mancante."
+msgstr "Errore: manca l'argomento %s."
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:509
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Errore: %s - la connessione non esiste."
 
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:515 ../cli/src/connections.c:1415
+#: ../cli/src/connections.c:1514 ../cli/src/connections.c:1587
+#: ../cli/src/devices.c:977 ../cli/src/devices.c:1057
+#: ../cli/src/devices.c:1204 ../cli/src/devices.c:1318
+#: ../cli/src/devices.c:1538
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parametro sconosciuto: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:524
 #, c-format
 msgid "Error: no valid parameter specified."
-msgstr "Errore: Non è stato specificato alcun parametro valido."
+msgstr "Errore: non è stato specificato alcun parametro valido."
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:539 ../cli/src/connections.c:1668
+#: ../cli/src/devices.c:1746 ../cli/src/network-manager.c:456
 #, c-format
 msgid "Error: %s."
 msgstr "Errore: %s."
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:627
 #, c-format
 msgid "Error: 'con status': %s"
-msgstr "Errore: 'con status': %s"
+msgstr "Errore: \"con status\": %s"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:629
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Errore: 'con status': %s; campi permessi: %s"
+msgstr "Errore: \"con status\": %s; campi consentiti: %s"
+
+#: ../cli/src/connections.c:637 ../cli/src/connections.c:1430
+#: ../cli/src/connections.c:1529 ../cli/src/connections.c:1601
+#: ../cli/src/devices.c:1004 ../cli/src/devices.c:1066
+#: ../cli/src/devices.c:1219 ../cli/src/devices.c:1348
+#: ../cli/src/devices.c:1567
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Errore: impossibile determinare se NetworkManager è in esecuzione: %s."
+
+#: ../cli/src/connections.c:641 ../cli/src/connections.c:1434
+#: ../cli/src/connections.c:1533 ../cli/src/connections.c:1605
+#: ../cli/src/devices.c:1008 ../cli/src/devices.c:1070
+#: ../cli/src/devices.c:1223 ../cli/src/devices.c:1352
+#: ../cli/src/devices.c:1571
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Errore: NetworkManager non è in esecuzione."
 
 # [NdT] si tratta di un messaggio che descrive un'azione
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:649
 msgid "Active connections"
 msgstr "Connessioni attive"
 
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1073
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "nessuna connessione attiva sul dispositivo '%s'"
+msgstr "nessuna connessione attiva sul dispositivo \"%s\""
 
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1081
 #, c-format
 msgid "no active connection or device"
 msgstr "nessuna connessione attiva o dispositivo"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1152
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "dispositivo '%s' non compatibile con la connessione '%s'"
+msgstr "dispositivo '%s' non compatibile con la connessione \"%s\""
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1154
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "nessun dispositivo trovato per la connessione '%s'"
+msgstr "nessun dispositivo trovato per la connessione \"%s\""
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1165
 msgid "activating"
-msgstr "attivazione in corso"
+msgstr "attivazione"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1167
 msgid "activated"
 msgstr "attivato"
 
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/connections.c:1169 ../cli/src/devices.c:294
+msgid "deactivating"
+msgstr "disattivazione"
+
+#: ../cli/src/connections.c:1172 ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1228 ../cli/src/devices.c:298
+#: ../cli/src/devices.c:678 ../cli/src/network-manager.c:111
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
+#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
+#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:513
+#: ../cli/src/utils.c:397
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1181
 msgid "VPN connecting (prepare)"
 msgstr "Connessione VPN (preparazione)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1183
 msgid "VPN connecting (need authentication)"
 msgstr "Connessione VPN (autenticazione necessaria)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1185
 msgid "VPN connecting"
 msgstr "connessione VPN"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1187
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connessione VPN (acquisizione configurazione IP)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1189
 msgid "VPN connected"
-msgstr "Connesso al VPN"
+msgstr "Connessi alla VPN"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1191
 msgid "VPN connection failed"
-msgstr "Connessione VPN fallita"
+msgstr "Connessione VPN non riuscita"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1193
 msgid "VPN disconnected"
-msgstr "VPN scollegato"
+msgstr "VPN scollegata"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1204
 msgid "unknown reason"
 msgstr "motivo sconosciuto"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1206
 msgid "none"
 msgstr "nessuno"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1208
 msgid "the user was disconnected"
 msgstr "l'utente è stato scollegato"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1210
 msgid "the base network connection was interrupted"
 msgstr "la connessione di rete di base è stata interrotta"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1212
 msgid "the VPN service stopped unexpectedly"
 msgstr "il servizio VPN si è arrestato inaspettatamente"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1214
 msgid "the VPN service returned invalid configuration"
-msgstr "il servizio VPN ha ritornato una configurazione non valida"
+msgstr "il servizio VPN ha restituito una configurazione non valida"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1216
 msgid "the connection attempt timed out"
 msgstr "il tentativo di connessione è scaduto"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1218
 msgid "the VPN service did not start in time"
-msgstr "il servizio VPN non si è stato avviato in tempo"
+msgstr "il servizio VPN non è stato avviato in tempo"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1220
 msgid "the VPN service failed to start"
-msgstr "l'avvio del servizio VPN è fallito"
+msgstr "l'avvio del servizio VPN non è riuscito"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1222
 msgid "no valid VPN secrets"
 msgstr "nessun segreto VPN valido"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1224
 msgid "invalid VPN secrets"
 msgstr "segreti VPN non validi"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1226
 msgid "the connection was removed"
 msgstr "la connessione è stata rimossa"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1240
 #, c-format
 msgid "state: %s\n"
 msgstr "stato: %s\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1243 ../cli/src/connections.c:1269
 #, c-format
 msgid "Connection activated\n"
 msgstr "Connessione attivata\n"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1246
 #, c-format
 msgid "Error: Connection activation failed."
-msgstr "Errore: Attivazione connessione fallita."
+msgstr "Errore: attivazione connessione non riuscita."
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1265
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "stato: %s (%d)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1275
 #, c-format
 msgid "Error: Connection activation failed: %s."
-msgstr "Errore: Attivazione connessione fallita: %s."
+msgstr "Errore: attivazione connessione non riuscita: %s."
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1292 ../cli/src/devices.c:1126
 #, c-format
 msgid "Error: Timeout %d sec expired."
-msgstr "Errore: Timeout, %d sec scaduti."
+msgstr "Errore: timeout, %d sec scaduti."
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1305
 #, c-format
 msgid "Error: Connection activation failed: %s"
-msgstr "Errore: Attivazione connessione fallita: %s"
+msgstr "Errore: attivazione connessione non riuscita: %s"
 
-#: ../cli/src/connections.c:1279
-#, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "Errore: Ottenimento connessione attiva per '%s' fallita."
-
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1311
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "Stato connessione attiva: %s\n"
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1312
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Percorso connessione attiva: %s\n"
 
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1364 ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1614
 #, c-format
 msgid "Error: Unknown connection: %s."
-msgstr "Errore: Connessione sconosciuta: %s."
+msgstr "Errore: connessione sconosciuta: %s."
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1410 ../cli/src/devices.c:1198
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
-msgstr "Errore: il valore di timeout '%s' non è valido."
+msgstr "Errore: il valore di timeout \"%s\" non è valido."
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1423 ../cli/src/connections.c:1522
+#: ../cli/src/connections.c:1594
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Errore: specificare id o uuid."
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1451
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "Errore: Nessun dispositivo idoneo trovato: %s."
+msgstr "Errore: nessun dispositivo idoneo trovato: %s."
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1453
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "Errore: Nessun dispositivo idoneo trovato."
+msgstr "Errore: nessun dispositivo idoneo trovato."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1558
 #, c-format
 msgid "Warning: Connection not active\n"
-msgstr "Attenzione: Connessione non attiva\n"
+msgstr "Attenzione: connessione non attiva\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1659
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "Errore: il comando 'con' '%s' non è valido."
+msgstr "Errore: il comando \"con\" \"%s\" non è valido."
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1724
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Errore: impossibile collegarsi a D-Bus."
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1732
 #, c-format
 msgid "Error: Could not get system settings."
-msgstr "Errore: Impossibile ottenere le impostazioni del sistema."
-
-#: ../cli/src/connections.c:1612
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "Errore: Impossibile ottenere le impostazioni dell'utente."
+msgstr "Errore: impossibile ottenere le impostazioni del sistema."
 
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:1742
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
+msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
-"Errore: Impossibile ottenere le connessioni: i servizi per le impostazioni "
-"non sono in esecuzione."
+"Errore: impossibile ottenere le connessioni (i servizi per le impostazioni "
+"non sono in esecuzione)."
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:212
+#: ../cli/src/devices.c:228
 msgid "DEVICE"
 msgstr "DISPOSITIVO"
 
 #. 1
 #. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
+#. 1
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:106
+#: ../cli/src/network-manager.c:39
 msgid "STATE"
 msgstr "STATO"
 
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:78
 msgid "GENERAL"
 msgstr "GENERALE"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:79
 msgid "CAPABILITIES"
 msgstr "CAPACITÀ"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:80
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIETÀ-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:81
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:82
 msgid "WIRED-PROPERTIES"
-msgstr "PROPRIETÀ-CABLATO"
+msgstr "PROPRIETÀ-VIA-CAVO"
 
 #. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:83
+msgid "WIMAX-PROPERTIES"
+msgstr "PROPRIETÀ-WIMAX"
+
+#. 5
+#. 0
+#: ../cli/src/devices.c:84 ../cli/src/devices.c:225
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:85
 msgid "IP4-SETTINGS"
 msgstr "IMPOSTAZIONI-IP4"
 
-#. 5
-#: ../cli/src/devices.c:77
+#. 7
+#: ../cli/src/devices.c:86
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
-#. 2
+#. 8
+#: ../cli/src/devices.c:87
+msgid "IP6-SETTINGS"
+msgstr "IMPOSTAZIONI-IP6"
+
+#. 9
 #: ../cli/src/devices.c:88
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
+#. 2
+#: ../cli/src/devices.c:104
 msgid "DRIVER"
 msgstr "DRIVER"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:105
 msgid "HWADDR"
 msgstr "HWADDR"
 
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:115
 msgid "CARRIER-DETECT"
 msgstr "RILEVAMENTO-CARRIER"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:116
 msgid "SPEED"
 msgstr "VELOCITÀ"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:125
 msgid "CARRIER"
 msgstr "CARRIER"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:135
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:136
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:137
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:138
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:139
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:149
+msgid "CTR-FREQ"
+msgstr "FREQ-CTR"
+
+#. 1
+#: ../cli/src/devices.c:150
+msgid "RSSI"
+msgstr "RSSI"
+
+#. 2
+#: ../cli/src/devices.c:151
+msgid "CINR"
+msgstr "CINR"
+
+#. 3
+#: ../cli/src/devices.c:152
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:153
+msgid "BSID"
+msgstr "BSID"
+
+#. 0
+#: ../cli/src/devices.c:163 ../cli/src/devices.c:174
 msgid "ADDRESS"
 msgstr "INDIRIZZO"
 
 #. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:175
 msgid "PREFIX"
 msgstr "PREFISSO"
 
 #. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:185 ../cli/src/devices.c:194
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:203
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:204
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:205
 msgid "MODE"
 msgstr "MODALITÀ"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:206
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:207
 msgid "RATE"
-msgstr "TASSO DI TRASFERIMENTO"
+msgstr "VELOCITÀ  "
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:208 ../cli/src/devices.c:226
 msgid "SIGNAL"
 msgstr "SEGNALE"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:209
 msgid "SECURITY"
 msgstr "SICUREZZA"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:210
 msgid "WPA-FLAGS"
-msgstr "WPA-FLAGS"
+msgstr "FLAG-WPA"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:211
 msgid "RSN-FLAGS"
-msgstr "RSN-FLAGS"
+msgstr "FLAG-RSN"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:213 ../cli/src/devices.c:229
 msgid "ACTIVE"
 msgstr "ATTIVO"
 
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:246
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
 "\n"
+"  COMMAND := { status | list | disconnect | wifi | wimax }\n"
+"\n"
 "  COMMAND := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"Utilizzo: nmcli dev { COMMAND | help }\n"
+"Uso: nmcli dev { COMANDO | help }\n"
 "\n"
-"  COMMAND := { status | list | disconnect | wifi }\n"
+"  COMANDO := { status | list | disconnect | wifi | wimax }\n"
+"\n"
+"  COMANDO := { status | list | disconnect | wifi }\n"
 "\n"
 "  status\n"
 "  list [iface ]\n"
 "  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"  wifi [list [iface ] [bssid ]]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:274
 msgid "unmanaged"
 msgstr "non gestito"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:276
 msgid "unavailable"
 msgstr "non disponibile"
 
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:278 ../cli/src/network-manager.c:108
 msgid "disconnected"
 msgstr "scollegato"
 
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:280
 msgid "connecting (prepare)"
 msgstr "connessione in corso (preparazione)"
 
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:282
 msgid "connecting (configuring)"
 msgstr "connessione in corso (configurazione)"
 
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:284
 msgid "connecting (need authentication)"
 msgstr "connessione in corso (autenticazione necessaria)"
 
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:286
 msgid "connecting (getting IP configuration)"
 msgstr "connessione in corso (acquisizione configurazione IP)"
 
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:288
+msgid "connecting (checking IP connectivity)"
+msgstr "connessione in corso (verifica connettività IP)"
+
+#: ../cli/src/devices.c:290
+msgid "connecting (starting secondary connections)"
+msgstr "connessione in corso (avvio connessioni secondarie)"
+
+#: ../cli/src/devices.c:292 ../cli/src/network-manager.c:104
 msgid "connected"
 msgstr "collegato"
 
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:296
 msgid "connection failed"
-msgstr "connessione fallita"
+msgstr "connessione non riuscita"
 
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:321 ../cli/src/devices.c:331 ../cli/src/devices.c:491
+#: ../cli/src/devices.c:535
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:364
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:389
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s: errore nella conversione dell'indirizzo IP4 0x%X"
 
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:460
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:461
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:470
 msgid "Encrypted: "
 msgstr "Cifrato: "
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:475
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:477
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:479
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:482
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:491
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:491
 msgid "Infrastructure"
 msgstr "Infrastruttura"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:526
+msgid "Home"
+msgstr "Home"
+
+#: ../cli/src/devices.c:529
+msgid "Partner"
+msgstr "Partner"
+
+#: ../cli/src/devices.c:532
+msgid "Roaming"
+msgstr "Roaming"
+
+#: ../cli/src/devices.c:602
 #, c-format
 msgid "Error: 'dev list': %s"
-msgstr "Errore: 'dev list': %s"
+msgstr "Errore: \"dev list\": %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:604
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "Errore: 'dev list': %s; campi permessi: %s"
+msgstr "Errore: \"dev list\": %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:613
 msgid "Device details"
 msgstr "Informazioni del dispositivo"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:647 ../cli/src/devices.c:1142 ../cli/src/utils.c:343
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:648
 msgid "unknown)"
 msgstr "sconosciuto)"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:674
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:747
 msgid "on"
 msgstr "on"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:747
 msgid "off"
 msgstr "off"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:994
 #, c-format
 msgid "Error: 'dev status': %s"
-msgstr "Errore: 'dev status': %s"
+msgstr "Errore: \"dev status\": %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:996
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Errore: 'dev status': %s; campi permessi: %s"
+msgstr "Errore: \"dev status\": %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1019
 msgid "Status of devices"
 msgstr "Stato dispositivo"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:1050
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "Errore: L'argomento '%s' è mancante."
+msgstr "Errore: manca l'argoamento \"%s\"."
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1091 ../cli/src/devices.c:1243
+#: ../cli/src/devices.c:1380 ../cli/src/devices.c:1599
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "Errore: Dispositivo '%s' non trovato."
+msgstr "Errore: dispositivo \"%s\" non trovato."
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1114
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
-msgstr "Successo: Dispositivo '%s' scollegato con successo."
+msgstr "Successo: dispositivo \"%s\" scollegato con successo."
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1139
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Errore: Scollegamento dispositivo '%s' (%s) fallito: %s"
+msgstr "Errore: scollegamento dispositivo \"%s\" (%s) non riuscito: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1147
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "Stato dispositivo: %d (%s)\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:1212
 #, c-format
 msgid "Error: iface has to be specified."
-msgstr "Errore: specificare iface."
+msgstr "Errore: iface deve essere specificato."
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1338
 #, c-format
 msgid "Error: 'dev wifi': %s"
-msgstr "Errore: 'dev wifi': %s"
+msgstr "Errore: \"dev wifi\": %s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1340
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "Error: 'dev wifi': %s; campi permessi: %s"
+msgstr "Error: \"dev wifi\": %s; campi consentiti: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1363
 msgid "WiFi scan list"
 msgstr "Elenco scansione WiFi"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1400 ../cli/src/devices.c:1454
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Errore: Punto di accesso con hwaddr '%s' non trovato."
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "Errore: punto di accesso con bssid \"%s\" non trovato."
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1417
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Errore: Il dispositivo '%s' non è un dispositivo WiFi."
+msgstr "Errore: il dispositivo \"%s\" non è un dispositivo WiFi."
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1481
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "Errore: il comando 'dev wifi' '%s' non è valido."
+msgstr "Errore: il comando \"dev wifi\" \"%s\" non è valido."
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1557
+#, c-format
+msgid "Error: 'dev wimax': %s"
+msgstr "Errore: \"dev wimax\": %s"
+
+#: ../cli/src/devices.c:1559
+#, c-format
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "Error: \"dev wimax\": %s; campi consentiti: %s"
+
+#: ../cli/src/devices.c:1582
+msgid "WiMAX NSP list"
+msgstr "Elenco NSP WiMAX"
+
+#: ../cli/src/devices.c:1619
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "Errore: NSP con come \"%s\" non trovato."
+
+#: ../cli/src/devices.c:1630
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "Errore: il dispositivo \"%s\" non è un dispositivo WiMAX."
+
+#: ../cli/src/devices.c:1661
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "Errore: punto di accesso con nso \"%s\" non trovato."
+
+#: ../cli/src/devices.c:1688
+#, c-format
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "Errore: il comando \"dev wimax\" \"%s\" non è valido."
+
+#: ../cli/src/devices.c:1738
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "Errore: il comando 'dev' '%s' non è valido."
+msgstr "Errore: il comando \"dev\" \"%s\" non è valido."
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "IN ESECUZIONE"
 
-#. 1
-#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "WIFI-HARDWARE"
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "VERSIONE"
 
 #. 2
-#: ../cli/src/network-manager.c:38
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr "NET-ENABLED"
+
+#. 3
+#: ../cli/src/network-manager.c:41
+msgid "WIFI-HARDWARE"
+msgstr "HARDWARE-WIFI"
+
+#. 4
+#: ../cli/src/network-manager.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#. 3
-#: ../cli/src/network-manager.c:39
+#. 5
+#: ../cli/src/network-manager.c:43
 msgid "WWAN-HARDWARE"
-msgstr "WWAN-HARDWARE"
+msgstr "HARDWARE-WWAN"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:62
+#. 7
+#: ../cli/src/network-manager.c:45
+msgid "WIMAX-HARDWARE"
+msgstr "HARDWARE-WIMAX"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
+#: ../cli/src/network-manager.c:67
 #, c-format
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"Utilizzo: nmcli nm { COMMAND | help }\n"
+"Uso: nmcli nm { COMANDO | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMANDO := { status | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMANDO := { status | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:96
 msgid "asleep"
 msgstr "dormiente"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:98
 msgid "connecting"
-msgstr "connessione"
+msgstr "in connessione"
+
+#: ../cli/src/network-manager.c:100
+msgid "connected (local only)"
+msgstr "collegato (solo local)"
 
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:102
+msgid "connected (site only)"
+msgstr "collegato (solo site)"
+
+#: ../cli/src/network-manager.c:106
+msgid "disconnecting"
+msgstr "in disconnessione"
+
+#: ../cli/src/network-manager.c:146
 #, c-format
 msgid "Error: 'nm status': %s"
-msgstr "Errore: 'nm status': %s"
+msgstr "Errore: \"nm status\": %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:148
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "Errore: 'nm status': %s; campi permessi: %s"
-
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "Stato NetworkManager"
-
-#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+msgstr "Errore: \"nm status\": %s; campi consentiti: %s"
+
+#. create NMClient
+#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
+#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
+#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
+#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
+#: ../cli/src/network-manager.c:421
 msgid "enabled"
 msgstr "abilitato"
 
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:161 ../cli/src/network-manager.c:162
+#: ../cli/src/network-manager.c:163 ../cli/src/network-manager.c:164
+#: ../cli/src/network-manager.c:165 ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:168 ../cli/src/network-manager.c:289
+#: ../cli/src/network-manager.c:344 ../cli/src/network-manager.c:382
+#: ../cli/src/network-manager.c:421
 msgid "disabled"
 msgstr "disabilitato"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:181
+msgid "NetworkManager status"
+msgstr "Stato NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:184
 msgid "running"
 msgstr "in esecuzione"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:184
 msgid "not running"
 msgstr "non in esecuzione"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Errore: impossibile collegarsi al bus di sistema: %s."
+
+#: ../cli/src/network-manager.c:226
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Errore: impossibile creare l'oggetto proxy D-Bus."
+
+#: ../cli/src/network-manager.c:232
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "Errore in sleep: %s"
+
+#: ../cli/src/network-manager.c:276 ../cli/src/network-manager.c:331
+#: ../cli/src/network-manager.c:369 ../cli/src/network-manager.c:408
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "Errore: qui il valore '--fields' '%s' non è valido; campi permessi: %s"
+msgstr ""
+"Errore: qui il valore \"--fields\" \"%s\" non è valido; campi consentiti: %s"
 
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:284
+msgid "Networking enabled"
+msgstr "Connettività di rete abilitata"
+
+#: ../cli/src/network-manager.c:300
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Errore: parametro \"enable\" non valido: \"%s\"; usare \"true\" o \"false\"."
+
+#: ../cli/src/network-manager.c:310
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Errore: lo stato di \"sleep\" non è esportato da NetworkManager."
+
+#: ../cli/src/network-manager.c:318
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Errore: parametro \"sleep\" non valido: \"%s\"; usare \"true\" o \"false\"."
+
+#: ../cli/src/network-manager.c:339
 msgid "WiFi enabled"
 msgstr "WiFi abilitato"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:355
 #, c-format
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "Errore: parametro 'wifi' non valido: '%s'."
+msgstr "Errore: parametro \"wifi\" non valido: \"%s\"."
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:377
 msgid "WWAN enabled"
 msgstr "WWAN abilitato"
 
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:393
 #, c-format
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "Errore: parametro 'wwan' non valido: '%s'."
+msgstr "Errore: parametro \"wwan\" non valido: \"%s\"."
+
+#: ../cli/src/network-manager.c:416
+msgid "WiMAX enabled"
+msgstr "WiMAX abilitato"
 
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:432
+#, c-format
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "Errore: parametro \"wimax\" non valido: \"%s\"."
+
+#: ../cli/src/network-manager.c:445
 #, c-format
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "Errore: comando 'nm' '%s' non valido."
+msgstr "Errore: comando \"nm\" \"%s\" non valido."
 
-#: ../cli/src/nmcli.c:69
+#: ../cli/src/nmcli.c:64
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -977,6 +1203,8 @@ msgid ""
 "  -f[ields] |all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
+"  -n[ocheck]                                 don't check nmcli and "
+"NetworkManager versions\n"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -986,587 +1214,736 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"Utilizzo: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"Uso: %s [OPZIONI] OGGETTO { COMANDO | help }\n"
 "\n"
-"OPTIONS\n"
-"  -t[erse]                                   output dettagliato\n"
-"  -p[retty]                                  output formattato\n"
-"  -m[ode] tabular|multiline                  modalità output\n"
-"  -f[ields] |all|common   specifica campi sull'output\n"
-"  -e[scape] yes|no                           esegue l'escape dei separatori delle colonne "
-"nei valori\n"
-"  -v[ersion]                                 mostra la versione del programma\n"
-"  -h[elp]                                    stampa questo aiuto\n"
+"OPZIONI\n"
+"  -t[erse]                                   Output dettagliato\n"
+"  -p[retty]                                  Output formattato\n"
+"  -m[ode] tabular|multiline                  Modalità output\n"
+"  -f[ields] |all|common   Specifica i campi da mostrare\n"
+"  -e[scape] yes|no                           Esegue l'escape dei "
+"separatori \n"
+"                                             delle colonne nei valori\n"
+"  -n[ocheck]                                 Non verifica le versioni di "
+"nmcli e\n"
+"                                             NetworkManager\n"
+"  -v[ersion]                                 Mostra la versione del "
+"programma\n"
+"  -h[elp]                                    Stampa questo aiuto\n"
 "\n"
-"OBJECT\n"
-"  nm          stato NetworkManager\n"
-"  con         connessioni NetworkManager\n"
-"  dev         dispositivi gestiti da NetworkManager\n"
+"OGGETTO\n"
+"  nm          Stato NetworkManager\n"
+"  con         Connessioni NetworkManager\n"
+"  dev         Dispositivi gestiti da NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:109
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "Errore: L'oggetto '%s' è sconosciuto, prova 'nmcli help'."
+msgstr "Errore: l'oggetto \"%s\" è sconosciuto, provare \"nmcli help\"."
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:139
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "Errore: L'opzione '--terse' è stata specificata una seconda volta."
+msgstr "Errore: l'opzione \"--terse\" è stata specificata una seconda volta."
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:144
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "Errore: L'opzione '--terse' si esclude con '--pretty'."
+msgstr "Errore: l'opzione \"--terse\" si esclude con \"--pretty\"."
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:152
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "Errore: L'opzione '--pretty' è stata specificata una seconda volta."
+msgstr "Errore: l'opzione \"--pretty\" è stata specificata una seconda volta."
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:157
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "Errore: L'opzione '--pretty' si esclude con '--terse'."
+msgstr "Errore: l'opzione \"--pretty\" si esclude con \"--terse\"."
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:167 ../cli/src/nmcli.c:183
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "Errore: argomento mancante per l'opzione '%s'."
+msgstr "Errore: manca l'argomento per l'opzione \"%s\"."
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:176 ../cli/src/nmcli.c:192
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "Errore: '%s' non è un argomento valido per l'opzione '%s'."
+msgstr "Errore: \"%s\" non è un argomento valido per l'opzione \"%s\"."
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:199
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "Errore: i campi per le opzioni '%s' sono mancanti."
+msgstr "Errore: mancano i campi per le opzioni \"%s\"."
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:207
 #, c-format
 msgid "nmcli tool, version %s\n"
-msgstr "tool nmcli, versione %s\n"
+msgstr "Strumento nmcli, versione %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:213
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Errore: L'opzione '%s' è sconosciuta, prova 'nmcli -help'."
+msgstr "Errore: l'opzione \"%s\" è sconosciuta, provare \"nmcli -help\"."
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:232
 #, c-format
 msgid "Caught signal %d, shutting down..."
-msgstr "Catturato segnale %d, arresto in corso..."
+msgstr "Intercettato segnale %d, arresto in corso"
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "Errore: Impossibile collegarsi al NetworkManager."
+#: ../cli/src/nmcli.c:257
+msgid "Error: Could not create NMClient object."
+msgstr "Errore: impossibile creare l'oggetto NMClient."
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:273
 msgid "Success"
 msgstr "Successo"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:447
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:449
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (frase di accesso a 104/128-bit)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:452
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (sconosciuto)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:478
 msgid "0 (unknown)"
 msgstr "0 (sconosciuto)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:484
 msgid "any, "
 msgstr "qualsiasi, "
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:486
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:488
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:490
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:492
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:494
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:496
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:498
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:500
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:502
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:504
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:506
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:508
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+
+#: ../cli/src/settings.c:510
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+
+#: ../cli/src/settings.c:636 ../cli/src/settings.c:835
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:829 ../cli/src/settings.c:832
+#: ../cli/src/settings.c:833 ../cli/src/utils.c:176
 msgid "not set"
 msgstr "non impostato"
 
-#: ../cli/src/utils.c:124
+#: ../cli/src/utils.c:128
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "il campo '%s' deve essere isolato"
+msgstr "il campo \"%s\" deve essere isolato"
 
-#: ../cli/src/utils.c:127
+#: ../cli/src/utils.c:131
 #, c-format
 msgid "invalid field '%s'"
-msgstr "campo '%s' invalido"
+msgstr "campo \"%s\" non valido"
 
-#: ../cli/src/utils.c:146
+#: ../cli/src/utils.c:150
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "Con l'opzione '--terse' è necessario specificare '--fields'"
+msgstr "Con l'opzione \"--terse\" è necessario specificare \"--fields\""
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:154
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "L'opzione '--terse' necessita valori dell'opzione '--fields' specifici, non '%s'"
+msgstr ""
+"L'opzione \"--terse\" necessita valori dell'opzione \"--fields\" specifici, "
+"non \"%s\""
+
+#: ../cli/src/utils.c:334
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+"Errore: impossibile creare l'oggetto proxy D-Bus per org.freedesktop.DBus"
+
+#: ../cli/src/utils.c:342
+#, c-format
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "Errore: richiesta NameHasOwner non riuscita: %s"
+
+#: ../cli/src/utils.c:387
+#, c-format
+msgid ""
+"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
+"nocheck to suppress the warning.\n"
+msgstr ""
+"Attenzione: le versioni di nmcli (%s) e NetworkManager (%s) non "
+"corrispondono. Usare --nocheck per disabilitare questo avviso.\n"
+
+#: ../cli/src/utils.c:396
+#, c-format
+msgid ""
+"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
+"execution using --nocheck, but the results are unpredictable."
+msgstr ""
+"Errore: le versioni di nmcli (%s) e NetworkManager (%s) non corrispondono. È "
+"possibile forzare l'esecuzione utilizzando --nocheck, ma i risultati non "
+"sono prevedibili."
 
-#: ../libnm-util/crypto.c:120
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
-msgstr "Il file di chiave PEM non ha tag di chiusura \"%s\""
+msgstr "Il file di chiave PEM non ha il tag di chiusura \"%s\""
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "Non sembra un file di chiave privata PEM."
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
-msgstr "Memoria non sufficiente per memorizzare i dati del file PEM."
+msgstr "Memoria insufficiente per memorizzare i dati del file PEM."
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "File PEM malformato: Proc-Type non è il primo tag."
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "File PEM malformato: tag Proc-Type \"%s\" sconosciuto."
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "File PEM malformato: DEK-Info non è il secondo tag."
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "File PEM malformato: IV non trovato nel tag DEK-Info."
 
-#: ../libnm-util/crypto.c:190
+#: ../libnm-util/crypto.c:206
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "File PEM malformato: formato di IV nel tag DEK-Info non valido."
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "File PEM malformato: cifrario chiave privata \"%s\" sconosciuto."
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "Impossibile decodificare la chiave privata."
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "Il certificato PEM \"%s\" non ha il tag di chiusura \"%s\"."
+#: ../libnm-util/crypto.c:284
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "Tag di apertura PKCS#8 atteso non trovato."
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:292
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "Decodifica del certificato fallita."
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "Tag di chiusura PKCS#8 \"%s\" atteso non trovato."
 
-#: ../libnm-util/crypto.c:286
-#, c-format
-msgid "Not enough memory to store certificate data."
-msgstr "Memoria non sufficiente per archiviare i dati del certificato."
+#: ../libnm-util/crypto.c:312
+msgid "Not enough memory to store private key data."
+msgstr "Memoria insufficiente per archiviare i dati della chiave privata."
+
+#: ../libnm-util/crypto.c:317
+msgid "Failed to decode PKCS#8 private key."
+msgstr "Decodifica della chiave private PKCS#8 non riuscita."
 
-#: ../libnm-util/crypto.c:294
+#: ../libnm-util/crypto.c:339 ../libnm-util/crypto.c:625
 #, c-format
-msgid "Not enough memory to store file data."
-msgstr "Memoria non sufficiente per archiviare i dati del file."
+msgid "Not enough memory to store certificate data."
+msgstr "Memoria insufficiente per archiviare i dati del certificato."
 
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV deve essere lungo un numero pari di byte."
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:374
 #, c-format
 msgid "Not enough memory to store the IV."
-msgstr "Memoria non sufficiente per archiviare l'IV."
+msgstr "Memoria insufficiente per archiviare l'IV."
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:385
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contiene cifre non esadecimali."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
-#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
-#: ../libnm-util/crypto_nss.c:336
+#: ../libnm-util/crypto.c:423 ../libnm-util/crypto_gnutls.c:147
+#: ../libnm-util/crypto_gnutls.c:265 ../libnm-util/crypto_nss.c:167
+#: ../libnm-util/crypto_nss.c:332
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Il cifrario di chiave privata \"%s\" è sconosciuto."
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:432
 #, c-format
 msgid "Not enough memory to decrypt private key."
-msgstr "Memoria non sufficiente per decifrare la chiave privata."
+msgstr "Memoria insufficiente per decifrare la chiave privata."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:497
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "Memoria insufficiente per archiviare la chiave privata decifrata."
+
+#: ../libnm-util/crypto.c:542
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Impossibile stabilire il tipo di chiave privata."
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:597
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "Memoria non sufficiente per archiviare la chiave privata decifrata."
+msgid "PEM certificate had no start tag '%s'."
+msgstr "Il certificato PEM non ha il tag di apertura \"%s\"."
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:606
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "Il certificato PEM non ha il tag di chiusura \"%s\"."
+
+#: ../libnm-util/crypto.c:630
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "Decodifica del certificato non riuscita."
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
-msgstr "Inizializzazione del motore di cifratura fallita."
+msgstr "Inizializzazione del motore di cifratura non riuscita."
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "Inizializzazione del motore MD5 fallita: %s / %s"
+msgstr "Inizializzazione del motore MD5 non riuscita: %s / %s"
 
-#: ../libnm-util/crypto_gnutls.c:156
+#: ../libnm-util/crypto_gnutls.c:155
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Lunghezza IV non valida (deve avere almento %zd)."
 
-#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
+#: ../libnm-util/crypto_gnutls.c:164 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
-msgstr "Memoria non sufficiente per il buffer della chiave decifrata."
+msgstr "Memoria insufficiente per il buffer della chiave decifrata."
 
-#: ../libnm-util/crypto_gnutls.c:173
+#: ../libnm-util/crypto_gnutls.c:172
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "Inizializzazione del contesto di decifrazione fallita: %s / %s."
+msgstr "Inizializzazione del contesto di decifrazione non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:182
+#: ../libnm-util/crypto_gnutls.c:181
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "Impostazione della chiave simmetrica per la decifrazione fallita: %s / %s."
+msgstr ""
+"Impostazione della chiave simmetrica per la decifrazione non riuscita: %s / "
+"%s."
 
-#: ../libnm-util/crypto_gnutls.c:191
+#: ../libnm-util/crypto_gnutls.c:190
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
-msgstr "Impostazione di IV per la decifrazione fallita: %s / %s."
+msgstr "Impostazione di IV per la decifrazione non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:200
+#: ../libnm-util/crypto_gnutls.c:199
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
-msgstr "Decifrazione della chiave privata fallita: %s / %s."
+msgstr "Decifrazione della chiave privata non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#: ../libnm-util/crypto_gnutls.c:209 ../libnm-util/crypto_nss.c:263
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr ""
 "Impossibile decifrare la chiave privata: lunghezza spazio di riempimento non "
 "previsto."
 
-#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278
+#: ../libnm-util/crypto_gnutls.c:220 ../libnm-util/crypto_nss.c:274
 #, c-format
 msgid "Failed to decrypt the private key."
-msgstr "Decifrazione della chiave privata fallita."
+msgstr "Decifrazione della chiave privata non riuscita."
 
-#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#: ../libnm-util/crypto_gnutls.c:285 ../libnm-util/crypto_nss.c:352
 #, c-format
 msgid "Could not allocate memory for encrypting."
 msgstr "Impossibile assegnare memoria per la cifratura."
 
-#: ../libnm-util/crypto_gnutls.c:294
+#: ../libnm-util/crypto_gnutls.c:293
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
-msgstr "Inizializzazione contesto del cifratore fallita: %s / %s."
+msgstr "Inizializzazione contesto del cifratore non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:303
+#: ../libnm-util/crypto_gnutls.c:302
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
-msgstr "Impostazione della chiave simmetrica per la codifica fallita: %s / %s."
+msgstr ""
+"Impostazione della chiave simmetrica per la codifica non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:313
+#: ../libnm-util/crypto_gnutls.c:312
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
-msgstr "Impostazione di IV per la cifratura fallita: %s / %s."
+msgstr "Impostazione di IV per la cifratura non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:322
+#: ../libnm-util/crypto_gnutls.c:321
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
-msgstr "Cifratura dati fallita: %s / %s."
+msgstr "Cifratura dati non riuscita: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Errore nell'inizializzare i dati dei certificati: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Impossibile decodificare il certificato: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "Impossibile inizializzare il decodificatore PKCS#12: %s"
 
-#: ../libnm-util/crypto_gnutls.c:421
+#: ../libnm-util/crypto_gnutls.c:420
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "Impossibile decodificare il file PKCS#12: %s"
 
-#: ../libnm-util/crypto_gnutls.c:433
+#: ../libnm-util/crypto_gnutls.c:432
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Impossibile verificare il file PKCS#12: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "Impossibile inizializzare il decodificatore PKCS#8: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "Impossibile decodificare il file PKCS#8: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
-msgstr "Inizializzazione del motore di cifratura fallita: %d."
+msgstr "Inizializzazione del motore di cifratura non riuscita: %d."
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
-msgstr "Inizializzazione del contesto MD5 fallita: %d."
+msgstr "Inizializzazione del contesto MD5 non riuscita: %d."
 
-#: ../libnm-util/crypto_nss.c:179
+#: ../libnm-util/crypto_nss.c:175
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "Lunghezza di IV non valida (deve avere almeno %d)."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
-msgstr "Inizializzazione dello slot del decifratore fallita."
+msgstr "Inizializzazione dello slot del decifratore non riuscita."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
-msgstr "Impostazione della chiave simmetrica di decifrazione fallita."
+msgstr "Impostazione della chiave simmetrica di decifrazione non riuscita."
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
-msgstr "Impostazione di IV per la decifrazione fallita."
+msgstr "Impostazione di IV per la decifrazione non riuscita."
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
-msgstr "Inizializzazione del contesto di decifrazione fallita."
+msgstr "Inizializzazione del contesto di decifrazione non riuscita."
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
-msgstr "Decifrazione della chiave privata fallita: %d."
+msgstr "Decifrazione della chiave privata non riuscita: %d."
 
-#: ../libnm-util/crypto_nss.c:245
+#: ../libnm-util/crypto_nss.c:241
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "Decodifica della chiave privata fallita: i dati decifrati sono troppo lunghi."
+msgstr ""
+"Decifratura della chiave privata non riuscita: i dati decifrati sono troppo "
+"lunghi."
 
-#: ../libnm-util/crypto_nss.c:256
+#: ../libnm-util/crypto_nss.c:252
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
-msgstr "Finalizzazione della decifrazione della chiave privata fallita: %d."
+msgstr ""
+"Finalizzazione della decifratura della chiave privata non riuscita: %d."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "Inizializzazione dello slot del cifratore fallita."
+msgstr "Inizializzazione dello slot del cifratore non riuscita."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
-msgstr "Impostazione della chiave simmetrica di cifratura fallita."
+msgstr "Impostazione della chiave simmetrica di cifratura non riuscita."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
-msgstr "Impostazione di IV per la cifratura fallita."
+msgstr "Impostazione di IV per la cifratura non riuscita."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
-msgstr "Inizializzazione del contesto di cifratura fallita."
+msgstr "Inizializzazione del contesto di cifratura non riuscita."
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
-msgstr "Cifratura fallita: %d."
+msgstr "Cifratura non riuscita: %d."
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "Quantità di dati non prevista dopo la cifratura."
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "Impossibile decodificare il certificato: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "Impossibile convertire la password in UCS2: %d"
 
-#: ../libnm-util/crypto_nss.c:510
+#: ../libnm-util/crypto_nss.c:506
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "Impossibile inizializzare il decodificatore PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:519
+#: ../libnm-util/crypto_nss.c:515
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "Impossibile decodificare il file PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:528
+#: ../libnm-util/crypto_nss.c:524
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "Impossibile verificare il file PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "Impossibile generare dati randomici."
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2000
 #, c-format
 msgid "Not enough memory to make encryption key."
-msgstr "Memoria non sufficiente per creare la chiave di cifratura."
+msgstr "Memoria insufficiente per creare la chiave di cifratura."
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2110
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Impossibile assegnare memoria per la creazione del file PEM."
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2122
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "Impossibile assegnare memoria per la scrittura di IV sul file PEM."
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2134
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Impossibile assegnare memoria per la scrittura della chiave cifrata sul file "
 "PEM."
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2153
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Impossibile assegnare memoria per i dati del file PEM."
 
-#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
-#: ../src/nm-netlink-monitor.c:653
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "errore nell'elaborare il messaggio netlink: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "Permettere il controllo delle connessioni di rete"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "si è verificato un errore durante l'attesa dei dati sul socket"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Condivisione della connessione attraverso una rete WiFi protetta"
 
-#: ../src/nm-netlink-monitor.c:254
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "impossibile collegarsi a netlink per monitorare lo stato del collegamento: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Connection sharing via an open WiFi network"
+msgstr "Condivisione della connessione attraverso una rete WiFi aperta"
 
-#: ../src/nm-netlink-monitor.c:265
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "impossibile abilitare il passaggio delle credenziali handle netlink: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable WiFi devices"
+msgstr "Abilitare o disabilitare i dispositivi WiFi"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "Abilitare o disabilitare dispositivi WiMAX a banda larga mobile"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "Enable or disable mobile broadband devices"
+msgstr "Abilitare o disabilitare i dispositivi a banda larga mobile"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "Enable or disable system networking"
+msgstr "Abilitare o disabilitare la rete di sistema"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "Modify network connections for all users"
+msgstr "Modifica le connessioni di sistema per tutti gli utenti"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "Modify persistent system hostname"
+msgstr "Modificare il nome host persistente del sistema"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "Modify personal network connections"
+msgstr "Modificare le connessioni personali"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
 msgstr ""
-"impossibile allocare un handle netlink per monitorare lo stato del "
-"collegamento: %s"
+"Sospendere o riattivare NetworkManager (dovrebbe essere usato solo dalla "
+"gestione alimentazione di sistema)"
 
-#: ../src/nm-netlink-monitor.c:376
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "La politica di sistema impedisce di controllare le connessioni di rete"
+
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:13
+msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr ""
-"impossibile allocare la cache dei collegamenti netlink per monitorare lo "
-"stato del collegamento: %s"
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
+"WiFi"
 
-#: ../src/nm-netlink-monitor.c:502
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "impossibile unirsi a un gruppo netlink: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:14
+msgid ""
+"System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi "
+"WiMAX a banda larga mobile"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "errore nell'aggiornare la cache dei link: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:15
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare i dispositivi a "
+"banda larga mobile"
+
+# [NdT] si tratta di un messaggio che descrive un'azione
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:16
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"La politica di sistema impedisce di abilitare o disabilitare la rete di "
+"sistema"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:17
+msgid "System policy prevents modification of network settings for all users"
+msgstr ""
+"La politica di sistema impedisce di modificare le impostazioni di rete per "
+"tutti gli utenti"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr ""
+"La politica di sistema impedisce di modificare le impostazioni di rete "
+"personali"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:19
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"La politica di sistema impedisce di modificare il nome host persistente del "
+"sistema"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:20
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"La politica di sistema impedisce di sospendere e riattivare NetworkManager"
 
-#: ../src/main.c:502
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:21
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"La politica di sistema impedisce di condividere connessioni attraverso una "
+"rete WiFi protetta"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:22
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"La politica di sistema impedisce di condividere connessioni attraverso una "
+"rete WiFi aperta"
+
+#: ../src/main.c:476
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Opzione non valida. Usare --help per ottenere un elenco delle opzioni "
 "valide.\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:517
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Usare --help per ottenere un elenco di opzioni valide.\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Creato da NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:69
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1575,93 +1952,167 @@ msgstr ""
 "# Unito da %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
 msgid "no usable DHCP client could be found."
 msgstr "non è stato trovato alcun client DHCP utilizzabile."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 msgid "'dhclient' could be found."
-msgstr "è stato trovato 'dhclient'"
+msgstr "è stato trovato \"dhclient\"."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
 msgid "'dhcpcd' could be found."
-msgstr "è stato trovato 'dhcpcd'"
+msgstr "è stato trovato \"dhcpcd\"."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
 #, c-format
 msgid "unsupported DHCP client '%s'"
-msgstr "client DHCP '%s' non supportato"
+msgstr "client DHCP \"%s\" non supportato"
+
+#: ../src/dns-manager/nm-dns-manager.c:376
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "Nota: il risolutore libc non supporta più di tre server di nomi."
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:378
+msgid "The nameservers listed below may not be recognized."
+msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
+
+#: ../src/logging/nm-logging.c:152
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "Livello log '%s' sconosciuto"
+msgstr "Livello di registrazione \"%s\" sconosciuto"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:177
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "Dominio log '%s' sconosciuto"
+msgstr "Dominio di registrazione \"%s\" sconosciuto"
 
-#: ../src/dns-manager/nm-dns-manager.c:343
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "NOTA: il risolutore libc non supporta più di 3 server di nomi."
+#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:355
+#, c-format
+msgid "CDMA connection %d"
+msgstr "Connessione CDMA %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:345
-msgid "The nameservers listed below may not be recognized."
-msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
+#: ../src/modem-manager/nm-modem-gsm.c:499 ../src/nm-device-bt.c:351
+#, c-format
+msgid "GSM connection %d"
+msgstr "Connessione GSM %d"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-device-bt.c:326
 #, c-format
-msgid "Auto %s"
-msgstr "%s (automatica)"
+msgid "PAN connection %d"
+msgstr "Connessione PAN %d"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
-msgid "System"
-msgstr "Sistema"
+#: ../src/nm-device-bt.c:359
+#, c-format
+msgid "DUN connection %d"
+msgstr "Connessione DUN %d"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Condivide connessione attraverso una rete WiFi protetta"
+#: ../src/nm-device-ethernet.c:1724
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "Connessione PPPoE %d"
 
 # [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Condivide connessione attraverso una rete WiFi aperta"
+#: ../src/nm-device-ethernet.c:1724 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "Connessione via cavo %d"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Modifica il nome host persistente del sistema"
+#: ../src/nm-device-olpc-mesh.c:393
+#, c-format
+msgid "Mesh %d"
+msgstr "Mesh %d"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Modifica le connessioni di sistema"
+#: ../src/nm-manager.c:669
+#, c-format
+msgid "VPN connection %d"
+msgstr "Connessione VPN %d"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "La politica di sistema impedisce di modificare le impostazioni di sistema"
+#: ../src/nm-netlink-monitor.c:101 ../src/nm-netlink-monitor.c:234
+#: ../src/nm-netlink-monitor.c:661
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "errore nell'elaborare il messaggio netlink: %s"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
+#: ../src/nm-netlink-monitor.c:216
+msgid "error occurred while waiting for data on socket"
+msgstr "si è verificato un errore durante l'attesa dei dati sul socket"
+
+#: ../src/nm-netlink-monitor.c:260
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
 msgstr ""
-"La politica di sistema impedisce di modificare il nome host persistente del "
-"sistema"
+"impossibile collegarsi a netlink per monitorare lo stato del collegamento: %s"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../src/nm-netlink-monitor.c:271
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
 msgstr ""
-"La politica di sistema impedisce di condividere connessioni attraverso una "
-"rete WiFi protetta"
+"impossibile abilitare il passaggio delle credenziali handle netlink: %s"
 
-# [NdT] si tratta di un messaggio che descrive un'azione
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
+#: ../src/nm-netlink-monitor.c:294 ../src/nm-netlink-monitor.c:354
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
 msgstr ""
-"La politica di sistema impedisce di condividere connessioni attraverso una "
-"rete WiFi aperta"
+"impossibile allocare un handle netlink per monitorare lo stato del "
+"collegamento: %s"
 
+#: ../src/nm-netlink-monitor.c:379
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"impossibile allocare la cache dei collegamenti netlink per monitorare lo "
+"stato del collegamento: %s"
+
+#: ../src/nm-netlink-monitor.c:506
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "impossibile unirsi a un gruppo netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:637 ../src/nm-netlink-monitor.c:650
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "errore nell'aggiornare la cache dei link: %s"
+
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3575
+#: ../src/settings/plugins/ifnet/connection_parser.c:51
+msgid "System"
+msgstr "Sistema"
+
+#~ msgid "SCOPE"
+#~ msgstr "SCOPO"
+
+#~ msgid "DBUS-SERVICE"
+#~ msgstr "SERVIZIO-DBUS"
+
+#~ msgid "system"
+#~ msgstr "sistema"
+
+#~ msgid "user"
+#~ msgstr "utente"
+
+# [NdT] si tratta di un messaggio che descrive un'azione
+#~ msgid "System connections"
+#~ msgstr "Connessioni di sistema"
+
+# [NdT] si tratta di un messaggio che descrive un'azione
+#~ msgid "User connections"
+#~ msgstr "Connessioni utente"
+
+#~ msgid "Error: Obtaining active connection for '%s' failed."
+#~ msgstr "Errore: ottenimento connessione attiva per \"%s\" non riuscito."
+
+#~ msgid "Auto %s"
+#~ msgstr "%s (automatica)"
+
+#~ msgid "Error: Could not get user settings."
+#~ msgstr "Errore: impossibile ottenere le impostazioni dell'utente."
+
+#~ msgid "Allow use of user-specific connections"
+#~ msgstr "Permettere l'uso di connessioni specifiche dell'utente"
+
+# [NdT] si tratta di un messaggio che descrive un'azione
+#~ msgid "System policy prevents use of user-specific connections"
+#~ msgstr ""
+#~ "La politica di sistema impedisce l'uso di connessioni specifiche "
+#~ "dell'utente"
diff --git a/policy/Makefile.in b/policy/Makefile.in
index 739987cd..cbbc7cfc 100644
--- a/policy/Makefile.in
+++ b/policy/Makefile.in
@@ -140,6 +140,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@
diff --git a/policy/org.freedesktop.NetworkManager.policy b/policy/org.freedesktop.NetworkManager.policy
index 7f349115..361c435d 100644
--- a/policy/org.freedesktop.NetworkManager.policy
+++ b/policy/org.freedesktop.NetworkManager.policy
@@ -18,10 +18,12 @@
     Ενεργοποίηση ή απενεργοποίηση δικτύωσης συστήματος
     Enŝalti aŭ elŝalti sistemretkonektadon
     Activar o desactivar la red del sistema
+    Activer ou désactiver le réseau système
     Activar ou desactivar a rede do sistema
     तंत्र संजालन सक्रिय या निष्क्रिय करें
     Rendszer hálózatkezelésének be- és kikapcsolása
     Aktifkan atau matikan jejaring sistem
+    Abilitare o disabilitare la rete di sistema
     ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
     시스템 네트워크 사용 여부
     Įjungti arba išjungti sistemos prieigą prie tinklo
@@ -46,10 +48,12 @@
     Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση της δικτύωσης του συστήματος
     Sistempolitiko preventas enŝalton aŭ elŝalton de sistema retkonektado
     La política del sistema evita activar o desactivar la red del sistema
+    La politique du système empêche l'activation ou la désactivation du réseau du système
     A normativa do sistema evita a activación ou desactivación da rede do sistema
     तंत्र संजालन के युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
     A rendszer házirendje megakadályozza a rendszer hálózatkezelésének be- vagy kikapcsolását
     Kebijakan sistem mencegah mengaktifkan atau mematikan jejaring sistem
+    La politica di sistema impedisce di abilitare o disabilitare la rete di sistema
     ವ್ಯವಸ್ಥೆಯ ಜಾಲಬಂಧವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ಪಾಲಿಸಿಯು ತಡೆಯುತ್ತಿದೆ
     시스템 정책이 시스템 네트워크의 사용 여부 설정을 금지합니다
     Sistemos politika neleidžia įjungti arba išjungti sistemos prieigos prie tinklo
@@ -81,10 +85,12 @@
     Θέση της Διαχείρισης δικτύου σε αδράνεια ή ενεργοποίησή της (πρέπει να χρησιμοποιείται μόνο από τη διαχείριση ενέργειας του συστήματος)
     Dormigi aŭ veki NetworkManager (estu uzata nur de sistema energimastumado)
     Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el gestor de energía del sistema)
+    Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la gestion d'énergie du système)
     Poñer o NetworkManager en suspensión e espertalo (só debe ser usado polo sistema de xestión de rede)
      NetworkManager को स्लीप स्थिति या वेकअप स्थिति में रखें (केवल सिस्टम पावर मैनेजमेंट के द्वारा प्रयोग किया जाएगा)
     Hálózatkezelő elaltatása vagy felébresztése (csak a rendszer energiagazdálkodása által használandó)
     Tidurkan NetworkManager atau bangunkan (mestinya hanya dipakai oleh manajemen daya sistem)
+    Sospendere o riattivare NetworkManager (dovrebbe essere usato solo dalla gestione alimentazione di sistema)
     NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸಿ (ಇದನ್ನು ಕೇವಲ ವ್ಯವಸ್ಥೆಯ ವಿದ್ಯುಚ್ಛಕ್ತಿ ನಿರ್ವಹಣೆಯಿಂದ ಮಾತ್ರ ಬಳಸಬೇಕು)
     네트워크 관리 프로그램을 일시 중지하거나 다시 시작합니다 (시스템 전원 관리에서만 사용)
     Užmigdyti arba pažadinti NetworkManager (tai turėtų naudoti tik sistemos energijos valdymo posistemė)
@@ -109,10 +115,12 @@
     Η πολιτική του συστήματος δεν επιτρέπει να τίθεται η διαχείριση δικτύου σε αδράνεια ή να ενεργοποιείται.
     Sistempolitiko preventas dormigi aŭ veki NetworkManager
     La política del sistema evita poner a NetworkManager a dormir o despertarlo
+    La politique du système empêche la mise en veille et le réveil de NetworkManager
     A normativa do sistema evita poñer o NetworkManager en suspensión ou espertalo
     NetworkManager को स्लीप या वेकअप स्थिति में लाने के लिए नेटवर्कमैनेजर रोकता है
     A rendszer házirendje megakadályozza a Hálózatkezelő elaltatását vagy felébresztését
     Kebijakan sistem mencegah menidurkan NetworkManager atau membangunkannya
+    La politica di sistema impedisce di sospendere e riattivare NetworkManager
     NetworkManager ಅನ್ನು ನಿದ್ರಾಸ್ಥಿತಿಗೆ ಅಥವ ಎಚ್ಚರಸ್ಥಿತಿಗೆ ಕಳುಹಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮವು ತಡೆಯುತ್ತಿದೆ
     시스템 정책이 네트워크 관리 프로그램의 일시 중지나 다시 시작을 금지합니다
     Sistemos politika neleidžia užmigdyti arba pažadinti NetworkManager
@@ -144,11 +152,13 @@
     Ενεργοποίηση ή απενεργοποίηση συσκευών ασύρματης δικτύωσης (WiFi)
     Enŝalti aŭ elŝalti WiFi-aparatojn
     Activar o desactivar los dispositivos inalámbricos
+    Activer ou désactiver des périphériques WiFi
     Activar ou desactivar os dispositivos WiFi
     WiFi युक्तियाँ सक्रिय या निष्क्रिय करें
     Omogućuje ili onemogućuje WiFi uređaje
     WiFi eszközök be- és kikapcsolása
     Aktifkan atau matikan perangkat WiFi
+    Abilitare o disabilitare i dispositivi WiFi
     WiFi ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
     WiFi 장치 사용 여부
     Įjungti arba išjungti WiFi įrenginius
@@ -173,10 +183,12 @@
     Η πολιτική συστήματος δεν επιτρέπει ενεργοποίηση ή απενεργοποίηση συσκευών ανοιχτού ασύρματου δικτύου (WiFi)
     Sistempolitiko preventas enŝalton aŭ elŝalton de WiFi-aparatoj
     La política de sistema evita activar o desactivar los dispositivos inalámbricos
+    La politique du système empêche l'activation ou la désactivation de périphériques WiFi
     A normativa do sistema evita a activación e desactivación dos dispositivos WiFi
     WiFi युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
     A rendszer házirendje megakadályozza a WiFi eszközök be- vagy kikapcsolását
     Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat WiFi
+    La politica di sistema impedisce di abilitare o disabilitare i dispositivi WiFi
     WiFi ಸಾಧನವನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
     시스템 정책이 WiFi 장치 사용 여부 설정을 금지합니다
     Sistemos politika neleidžia įjungti arba išjungti WiFi įrenginių
@@ -208,11 +220,13 @@
     Ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας
     Enŝalti aŭ elŝalti poŝtelefonajn larĝkapacitajn aparatojn
     Activar o desactivar los dispositivos de banda ancha móvil
+    Activer ou désactiver des périphériques mobiles à large bande
     Activar ou desactivar os dispositivos de banda ancha móbiles
     मोबाइल ब्राडबैंड युक्तियाँ सक्रिय या निष्क्रिय करें
     Omogućuje ili onemogućuje mobilne širokopojasne uređaje
     Mobil széles sávú eszközök be- és kikapcsolása
     Aktifkan atau matikan perangkat broadband bergerak
+    Abilitare o disabilitare i dispositivi a banda larga mobile
     ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ ಅಥವ ಅಶಕ್ತಗೊಳಿಸಿ
     모바일 광대역 장치 사용 여부
     Įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginius
@@ -237,10 +251,12 @@
     Η πολιτική του συστήματος δεν επιτρέπει την ενεργοποίηση ή απενεργοποίηση συσκευών ευρυζωνικότητας κινητής τηλεφωνίας
     Sistempolitiko preventas enŝalton aŭ elŝalton de poŝtelefonaj larĝkapacitaj aparatoj
     La política del sistema evita activar o desactivar los dispositivos de banda ancha móvil
+    La politique du système empêche l'activation ou la désactivation de périphériques mobiles à large bande
     A normativa do sistema evita a activación ou desactivación dos dispositivos de banda ancha.
     मोबाइल ब्रॉडबैंड युक्ति के सक्रियण या निष्क्रियण को तंत्र नीति रोकता है
     A rendszer házirendje megakadályozza a mobil széles sávú eszközök be- vagy kikapcsolását
     Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak
+    La politica di sistema impedisce di abilitare o disabilitare i dispositivi a banda larga mobile
     ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತ ಅಥವ ಅಶಕ್ತಗೊಳಿಸದಂತೆ ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
     시스템 정책이 모바일 광대역 장치의 사용 여부 설정을 금지합니다
     Sistemos politika neleidžia įjungti arba išjungti mobiliojo plačiajuosčio ryšio įrenginių
@@ -269,10 +285,12 @@
     Mobile WiMAX-Breitbandgeräte aktivieren oder deaktivieren
     Enŝalti aŭ elŝalti WiMAX-larĝkapacitajn aparatojn
     Activar o desactivar los dispositivos de banda ancha móvil WiMAX
+    Activer ou désactiver des périphériques WiMAX à large bande
     Activar ou desactivar os dispositivos de banda larga móbil WIMAX
     Omogućuje ili onemogućuje WiMAX mobilne širokopojasne uređaje
     WiMAX mobil széles sávú eszközök be- és kikapcsolása
     Aktifkan atau matikan perangkat broadband bergerak WiMAX
+    Abilitare o disabilitare dispositivi WiMAX a banda larga mobile
     와이맥스 모바일 광대역 장치 사용 여부
     WiMAX मोबाईल ब्रॉडबँड साधने सुरू किंवा बंद करा
     Włączenie lub wyłączenie urządzeń komórkowych WiMAX
@@ -285,9 +303,11 @@
     Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler WiMAX-Breitbandgeräte
     Sistempolitiko preventas enŝalton aŭ elŝalton de larĝkapacitaj WiMAX-aparatoj
     La política del sistema evita activar o desactivar los dispositivos de banda ancha móvil WiMAX
+    La politique du système empêche l'activation ou la désactivation de périphériques WiMAX à large bande
     A normativa do sistema evita activar ou desactivar os dispositivos de banda larga móbil WIMAX.
     A rendszer házirendje megakadályozza a WiMAX mobil széles sávú eszközök be- vagy kikapcsolását
     Kebijakan sistem mencegah mengaktifkan atau mematikan perangkat broadband bergerak WiMAX
+    La politica di sistema impedisce di abilitare o disabilitare i dispositivi WiMAX a banda larga mobile
     시스템 정책이 와이맥스 모바일 광대역 장치의 사용 여부 설정을 금지합니다
     प्रणाली करार WiMAX मोबाईल ब्रॉडबँड साधनांना सुरू किंवा बंद होण्यापासून रोखते
     Polityka systemu powstrzymuje włączenie lub wyłączenie urządzeń komórkowych WiMAX
@@ -310,11 +330,13 @@
     Να επιτρέπεται ο έλεγχος των συνδέσεων δικτύου
     Permesi kontrolon de retkonektoj
     Permitir controlar las conexiones de red
+    Autoriser le contrôle des connexions réseau
     Permitir o control das conexións de rede
     संजाल कनेक्शन के नियंत्रण स्वीकार करें
     Dozvoli upravljanje mrežnim vezama
     Hálózati kapcsolatok felügyeletének engedélyezése
     Ijinkan pengendalian sambungan jaringan
+    Permettere il controllo delle connessioni di rete
     ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ಅನುಮತಿಸಿ
     네트워크 연결 조작 허용
     Leisti valdyti tinklo ryšius
@@ -339,10 +361,12 @@
     Η πολιτική συστήματος δεν επιτρέπει τον έλεγχο των συνδέσεων δικτύου
     Sistempolitiko preventas kontrolon de retkonektoj
     La política de sistema evita el control de las conexiones de red
+    La politique du système empêche le contrôle des connexions réseau
     A normativa do sistema evita o control das conexións de rede
     सिस्टम कनेक्शन के नियंत्रण को सिस्टम नीति रोकता है
     A rendszer házirendje megakadályozza a hálózati kapcsolatok felügyeletét
     Kebijakan sistem mencegah pengendalian sambungan jaringan
+    La politica di sistema impedisce di controllare le connessioni di rete
     ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸುವುದನ್ನು ವ್ಯವಸ್ಥೆಯ ನಿಯಮಗಳು ತಡೆಯುತ್ತಿವೆ
     시스템 정책이 네트워크 연결 조작을 금지합니다
     Sistemos politika neleidžia valdyti tinklo ryšių
@@ -386,7 +410,7 @@
     Dijeljenje veze korištenjem zaštićene WiFi mreže
     Kapcsolatmegosztás védett WiFi hálózaton
     Berbagi koneksi melalui jaringan WiFi terlindung.
-    Condivide connessione attraverso una rete WiFi protetta
+    Condivisione della connessione attraverso una rete WiFi protetta
     保護された WiFi ネットワーク経由で接続共有
     ಒಂದು ಸಂರಕ್ಷಿತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ
     보호된 WiFi 네트워크를 통한 연결 공유
@@ -421,7 +445,7 @@
     La política del sistema evita compartir conexiones a través de una red WiFi protegida
     Sistemako arauek babestutako haririk gabeko sareen bidez konexioak partekatzea saihesten dute
     Tietoturvakäytäntö estää yhteyksien jakamisen suojatun langattoman verkon kautta
-    La stratégie du système empêche tout partage des connexions via un réseau WiFi protégé
+    La politique du système empêche tout partage des connexions via un réseau WiFi protégé
     A política do sistema impide compartir conexións a través dunha rede WiFi protexida
     સિસ્ટમ પોલિસી એ સુરક્ષિત થયેલ WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે
     किसी संरक्षित WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है
@@ -476,7 +500,7 @@
     Dijeljenje veze korištenjem otvorene WiFi mreže
     Kapcsolatmegosztás nyílt WiFi hálózaton
     Berbagi koneksi melalui jaringan WiFi terbuka
-    Condivide connessione attraverso una rete WiFi aperta
+    Condivisione della connessione attraverso una rete WiFi aperta
     開放した WiFi ネットワーク経由で接続共有
     ಒಂದು ಮುಕ್ತವಾದ WiFi ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸುವಿಕೆ
     열린 WiFi 네트워크를 통한 연결 공유
@@ -511,7 +535,7 @@
     La política del sistema evita compartir conexiones a través de una red WiFi abierta
     Sistemako arauek irakitako haririk gabeko sareen bidez konexioak partekatzea saihesten dute
     Tietoturvakäytäntö estää yhteyksien jakamisen avoimen langattoman verkon kautta
-    La stratégie du système empêche tout partage des connexions via un réseau WiFi ouvert
+    La politique du système empêche tout partage des connexions via un réseau WiFi ouvert
     A política do sistema impide compartir conexións a través dunha rede WiFi aberta
     સિસ્ટમ પોલિસી એ ખુલ્લા WiFi નેટવર્ક મારફતે વહેંચણી જોડાણોને રોકી રહ્યા છે
     किसी खुले WiFi संजाल के द्वारा साझा कनेक्शन को सिस्टम नीति रोकता है
@@ -549,9 +573,11 @@
     Eigene Netzwerkverbindungen bearbeiten
     Modifi proprajn retkonektojn
     Modificar las conexiones de red personales
+    Modifier les connexions du réseau personnel
     Modificar as conexións de rede persoais
     Személyes hálózati kapcsolatok módosítása
     Ubah koneksi jaringan personal
+    Modificare le connessioni personali
     개인 네트워크 연결을 수정합니다
     वैयक्तिक नेटवर्क जोडणी संपादित करा
     Modyfikacja osobistych połączeń sieciowych
@@ -562,9 +588,11 @@
     Die Systemrichtlinien verhindern das Bearbeiten von eigenen Netzwerkeinstellungen
     Sistempolitiko preventas modifadon de propraj retagordoj
     La política del sistema evita la modificación de la configuración personal de la red
+    La politique du système empêche toute modification des paramètres réseau personnels
     A política do sistema impide a modificación da configuración persoal da rede
     A rendszer házirendje megakadályozza a személyes hálózati beállítások módosítását
     Kebijakan sistem mencegah pengubahan tatanan jaringan pribadi
+    La politica di sistema impedisce di modificare le impostazioni di rete personali
     시스템 정책이 개인 네트워크 설정의 수정을 금지합니다
     प्रणाली करार, व्यक्तिगत नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते
     Polityka systemu powstrzymuje modyfikację osobistych ustawień systemowych
@@ -582,9 +610,11 @@
     Netzwerkverbindungen für alle Benutzer bearbeiten
     Modifi retkonektojn por ĉiuj uzantoj
     Modificar las conexiones de red para todos los usuarios
+    Modifier les connexions réseau pour tous les utilisateurs
     Modificar as conexións de rede para tódolos usuarios
     Hálózati kapcsolatok módosítása minden felhasználó számára
     Ubah koneksi jaringan bagi semua pengguna
+    Modifica le connessioni di sistema per tutti gli utenti
     모든 사용자의 네트워크 연결을 수정합니다
     सर्व वापरकर्त्यांकरीता नेटवर्क जोडणी संपादित करा
     Modyfikacja połączeń sieciowych dla wszystkich użytkowników
@@ -595,9 +625,11 @@
     Die Systemrichtlinien verhindern das Bearbeiten von Netzwerkeinstellungen für alle Benutzer
     Sistempolitiko preventas modifadon de retagordoj por ĉiuj uzantoj
     La política del sistema evita la modificación de la configuración de la red para todos los usuarios
+    La politique du système empêche toute modification des paramètres réseau pour tous les utilisateurs
     A política do sistema impide a modificación da configuración da rede para tódolos usuarios
     A rendszer házirendje megakadályozza a hálózati beállítások módosítását minden felhasználó számára
     Kebijakan sistem mencegah pengubahan tatanan sistem bagi semua pengguna
+    La politica di sistema impedisce di modificare le impostazioni di rete per tutti gli utenti
     시스템 정책이 모든 사용자의 네트워크 설정의 수정을 금지합니다
     प्रणाली करार सर्व वापरकर्त्यांना नेटवर्क सेटिंग्स् संपादीत करण्यापासून रोखते
     Polityka systemu powstrzymuje modyfikację ustawień sieciowych dla wszystkich użytkowników
@@ -625,13 +657,13 @@
     Modificar nombre de host de sistema persistente
     Aldatu sistemako ostalari-izen iraunkorra
     Muuta järjestelmän verkkonimeä
-    Modifier le nom d'hôte du système persistant
+    Modifier le nom d'hôte persistant du système
     Modificar o nome persistente do anfitrión do sistema
     નિરંતર સિસ્ટમ યજમાનનામને બદલો
     स्थिर सिस्टम होस्टनेम को सुधारें
     Állandó rendszergépnév módosítása
     Ubah nama host sistem yang persisten
-    Modifica il nome host persistente del sistema
+    Modificare il nome host persistente del sistema
     永続化システムのホスト名を修正
     ಸ್ಥಿರ ವ್ಯವಸ್ಥೆಯ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಮಾರ್ಪಡಿಸಿ
     영구적인 시스템 호스트 이름을 수정합니다
@@ -666,7 +698,7 @@
     La política del sistema evita la modificación del nombre persistente del sistema
     Sistemako arauek sistemako ostalari-izen iraunkorra aldatzea saihesten dute
     Tietoturvakäytäntö estää tietokoneen nimen muuttamisen
-    La stratégie du système empêche toute modification du nom d'hôte du système persistant
+    La politique du système empêche toute modification du nom d'hôte persistant du système
     A política do sistema impide a modificación do nome do anfitrión do sistema
     સિસ્ટમ પોલિસી એ નિરંતર સિસ્ટમ યજમાનનામનાં બદલાવને અટકાવે છે
     सिस्टम नीति स्थिर सिस्टम होस्टनेम के रूपांतरण को रोकता है.
diff --git a/src/Makefile.in b/src/Makefile.in
index 103df7fb..5a388235 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -304,6 +304,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@
diff --git a/src/backends/Makefile.in b/src/backends/Makefile.in
index 9eb2e0ff..87d3df4e 100644
--- a/src/backends/Makefile.in
+++ b/src/backends/Makefile.in
@@ -195,6 +195,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@
diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in
index 764493a4..9eb31c80 100644
--- a/src/bluez-manager/Makefile.in
+++ b/src/bluez-manager/Makefile.in
@@ -152,6 +152,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@
diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in
index d373f7e9..2d90f043 100644
--- a/src/dhcp-manager/Makefile.in
+++ b/src/dhcp-manager/Makefile.in
@@ -200,6 +200,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@
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index f10f3de9..16c6dd77 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -262,7 +262,7 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data)
 		             priv->iface, pid,
 		             WIFEXITED (status) ? WEXITSTATUS (status) : -1);
 	} else {
-		nm_log_info (LOGD_DHCP6, "(%s): DHCPv4 client pid %d exited with status %d",
+		nm_log_info (LOGD_DHCP4, "(%s): DHCPv4 client pid %d exited with status %d",
 		             priv->iface, pid,
 		             WIFEXITED (status) ? WEXITSTATUS (status) : -1);
 	}
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 88136a90..09321396 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -418,8 +418,8 @@ dhclient_start (NMDHCPClient *client,
 	GPtrArray *argv = NULL;
 	GPid pid = -1;
 	GError *error = NULL;
-	const char *iface, *uuid;
-	char *binary_name, *cmd_str, *pid_file = NULL;
+	const char *iface, *uuid, *system_bus_address;
+	char *binary_name, *cmd_str, *pid_file = NULL, *system_bus_address_env = NULL;
 	gboolean ipv6;
 	guint log_domain;
 
@@ -503,6 +503,18 @@ dhclient_start (NMDHCPClient *client,
 		g_ptr_array_add (argv, (gpointer) priv->conf_file);
 	}
 
+	/* Usually the system bus address is well-known; but if it's supposed
+	 * to be something else, we need to push it to dhclient, since dhclient
+	 * sanitizes the environment it gives the action scripts.
+	 */
+	system_bus_address = getenv ("DBUS_SYSTEM_BUS_ADDRESS");
+	if (system_bus_address) {
+		system_bus_address_env = g_strdup_printf ("DBUS_SYSTEM_BUS_ADDRESS=%s", system_bus_address);
+		g_ptr_array_add (argv, (gpointer) "-e");
+		g_ptr_array_add (argv, (gpointer) system_bus_address_env);
+	}
+
+
 	g_ptr_array_add (argv, (gpointer) iface);
 	g_ptr_array_add (argv, NULL);
 
@@ -521,6 +533,7 @@ dhclient_start (NMDHCPClient *client,
 	}
 
 	g_ptr_array_free (argv, TRUE);
+	g_free (system_bus_address_env);
 	return pid;
 }
 
diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in
index 8a3c2e97..5c4c23a5 100644
--- a/src/dhcp-manager/tests/Makefile.in
+++ b/src/dhcp-manager/tests/Makefile.in
@@ -150,6 +150,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@
diff --git a/src/dns-manager/Makefile.in b/src/dns-manager/Makefile.in
index d44c3bfc..571f585b 100644
--- a/src/dns-manager/Makefile.in
+++ b/src/dns-manager/Makefile.in
@@ -153,6 +153,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@
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 0203f2bb..ddfd47c8 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -1097,15 +1097,20 @@ dispose (GObject *object)
 		g_slist_free (priv->plugins);
 		priv->plugins = NULL;
 
-		/* If we're quitting leave a valid resolv.conf in place, not one
-		 * pointing to 127.0.0.1 if any plugins were active.  Thus update
-		 * DNS after disposing of all plugins.
+		/* If last_iface is NULL, this means we haven't done a DNS update before,
+		 * so no reason to try and take down entries from resolv.conf.
 		 */
-		if (!update_dns (self, priv->last_iface, TRUE, &error)) {
-			nm_log_warn (LOGD_DNS, "could not commit DNS changes on shutdown: (%d) %s",
-					     error ? error->code : -1,
-					     error && error->message ? error->message : "(unknown)");
-			g_clear_error (&error);
+		if (priv->last_iface != NULL) {
+			/* If we're quitting leave a valid resolv.conf in place, not one
+			 * pointing to 127.0.0.1 if any plugins were active.  Thus update
+			 * DNS after disposing of all plugins.
+			 */
+			if (!update_dns (self, priv->last_iface, TRUE, &error)) {
+				nm_log_warn (LOGD_DNS, "could not commit DNS changes on shutdown: (%d) %s",
+				             error ? error->code : -1,
+				             error && error->message ? error->message : "(unknown)");
+				g_clear_error (&error);
+			}
 		}
 
 		g_slist_foreach (priv->configs, (GFunc) g_object_unref, NULL);
diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in
index de3a4478..5b1328bf 100644
--- a/src/dnsmasq-manager/Makefile.in
+++ b/src/dnsmasq-manager/Makefile.in
@@ -149,6 +149,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@
diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in
index 1912bd59..6eb818c0 100644
--- a/src/ip6-manager/Makefile.in
+++ b/src/ip6-manager/Makefile.in
@@ -150,6 +150,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@
diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c
index 1c761305..503dab51 100644
--- a/src/ip6-manager/nm-ip6-manager.c
+++ b/src/ip6-manager/nm-ip6-manager.c
@@ -1354,6 +1354,7 @@ nm_ip6_manager_init (NMIP6Manager *manager)
 	priv->monitor = nm_netlink_monitor_get ();
 	nm_netlink_monitor_subscribe (priv->monitor, RTNLGRP_IPV6_IFADDR, NULL);
 	nm_netlink_monitor_subscribe (priv->monitor, RTNLGRP_IPV6_PREFIX, NULL);
+	nm_netlink_monitor_subscribe (priv->monitor, RTNLGRP_IPV6_ROUTE, NULL);
 	nm_netlink_monitor_subscribe (priv->monitor, RTNLGRP_ND_USEROPT, NULL);
 	nm_netlink_monitor_subscribe (priv->monitor, RTNLGRP_LINK, NULL);
 
diff --git a/src/logging/Makefile.in b/src/logging/Makefile.in
index 4606160a..72274507 100644
--- a/src/logging/Makefile.in
+++ b/src/logging/Makefile.in
@@ -146,6 +146,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@
diff --git a/src/main.c b/src/main.c
index b7c0fd5a..12a0b893 100644
--- a/src/main.c
+++ b/src/main.c
@@ -563,9 +563,18 @@ main (int argc, char *argv[])
 	umask (022);
 
 	g_type_init ();
+
+/*
+ * Threading is always enabled starting from GLib 2.31.0.
+ * See also http://developer.gnome.org/glib/2.31/glib-Deprecated-Thread-APIs.html.
+ */
+#if !GLIB_CHECK_VERSION (2,31,0)
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
 	dbus_g_thread_init ();
+#else
+	dbus_threads_init_default ();
+#endif
 
 #ifndef HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS
 #error HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS not defined
diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in
index c78ed0f3..494bb1be 100644
--- a/src/modem-manager/Makefile.in
+++ b/src/modem-manager/Makefile.in
@@ -152,6 +152,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@
diff --git a/src/nm-device.c b/src/nm-device.c
index a4cd3e93..95f07e44 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1863,7 +1863,7 @@ release_shared_ip (gpointer data)
 static guint32
 reserve_shared_ip (void)
 {
-	guint32 start = (guint32) ntohl (0x0a2a2b01); /* 10.42.43.1 */
+	guint32 start = (guint32) ntohl (0x0a2a0001); /* 10.42.0.1 */
 	guint32 count = 0;
 
 	while (g_hash_table_lookup (shared_ips, GUINT_TO_POINTER (start + count))) {
diff --git a/src/nm-policy-hostname.c b/src/nm-policy-hostname.c
index 4fe69c5a..f98aa9c6 100644
--- a/src/nm-policy-hostname.c
+++ b/src/nm-policy-hostname.c
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2004 - 2010 Red Hat, Inc.
+ * Copyright (C) 2004 - 2011 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
@@ -36,7 +36,11 @@
 struct HostnameThread {
 	GThread *thread;
 
+#if GLIB_CHECK_VERSION (2,31,0)
+	GMutex lock;
+#else
 	GMutex *lock;
+#endif
 	gboolean dead;
 	int ret;
 
@@ -50,6 +54,25 @@ struct HostnameThread {
 	gpointer user_data;
 };
 
+/*
+ * GMutex API has changed:
+ * http://developer.gnome.org/glib/2.31/glib-Threads.html#GMutex
+ * http://developer.gnome.org/glib/2.31/glib-Deprecated-Thread-APIs.html
+*/
+#if GLIB_CHECK_VERSION (2,31,0)
+#define X_MUTEX_LOCK(mutex)        g_mutex_lock   (&(mutex))
+#define X_MUTEX_UNLOCK(mutex)      g_mutex_unlock (&(mutex))
+#define X_MUTEX_INIT(mutex)        g_mutex_init   (&(mutex))
+#define X_MUTEX_CLEAR(mutex)       g_mutex_clear  (&(mutex))
+#define X_THREAD_CREATE(func,data) g_thread_try_new ("hostname-thread", func, data, NULL);
+#else
+#define X_MUTEX_LOCK(mutex)        g_mutex_lock   (mutex)
+#define X_MUTEX_UNLOCK(mutex)      g_mutex_unlock (mutex)
+#define X_MUTEX_INIT(mutex)        mutex = g_mutex_new ()
+#define X_MUTEX_CLEAR(mutex)       g_mutex_free (mutex)
+#define X_THREAD_CREATE(func,data) g_thread_create (func, data, FALSE, NULL);
+#endif
+
 static gboolean
 hostname_thread_run_cb (gpointer user_data)
 {
@@ -72,12 +95,12 @@ hostname_thread_worker (gpointer data)
 
 	nm_log_dbg (LOGD_DNS, "(%p) starting address reverse-lookup", ht);
 
-	g_mutex_lock (ht->lock);
+	X_MUTEX_LOCK (ht->lock);
 	if (ht->dead) {
-		g_mutex_unlock (ht->lock);
+		X_MUTEX_UNLOCK (ht->lock);
 		return (gpointer) NULL;
 	}
-	g_mutex_unlock (ht->lock);
+	X_MUTEX_UNLOCK (ht->lock);
 
 	ht->ret = getnameinfo (ht->addr, ht->addr_size, ht->hostname, NI_MAXHOST, NULL, 0, NI_NAMEREQD);
 	if (ht->ret == 0) {
@@ -106,7 +129,7 @@ hostname_thread_free (HostnameThread *ht)
 
 	nm_log_dbg (LOGD_DNS, "(%p) freeing reverse-lookup thread", ht);
 
-	g_mutex_free (ht->lock);
+	X_MUTEX_CLEAR (ht->lock);
 	memset (ht, 0, sizeof (HostnameThread));
 	g_free (ht);
 }
@@ -123,7 +146,7 @@ hostname4_thread_new (guint32 ip4_addr,
 	ht = g_malloc0 (sizeof (HostnameThread));
 	g_assert (ht);
 
-	ht->lock = g_mutex_new ();
+	X_MUTEX_INIT (ht->lock);
 	ht->callback = callback;
 	ht->user_data = user_data;
 
@@ -132,7 +155,7 @@ hostname4_thread_new (guint32 ip4_addr,
 	ht->addr = (struct sockaddr *) &ht->addr4;
 	ht->addr_size = sizeof (ht->addr4);
 
-	ht->thread = g_thread_create (hostname_thread_worker, ht, FALSE, NULL);
+	ht->thread = X_THREAD_CREATE (hostname_thread_worker, ht);
 	if (!ht->thread) {
 		hostname_thread_free (ht);
 		return NULL;
@@ -158,7 +181,7 @@ hostname6_thread_new (const struct in6_addr *ip6_addr,
 	ht = g_malloc0 (sizeof (HostnameThread));
 	g_assert (ht);
 
-	ht->lock = g_mutex_new ();
+	X_MUTEX_INIT (ht->lock);
 	ht->callback = callback;
 	ht->user_data = user_data;
 
@@ -167,7 +190,7 @@ hostname6_thread_new (const struct in6_addr *ip6_addr,
 	ht->addr = (struct sockaddr *) &ht->addr6;
 	ht->addr_size = sizeof (ht->addr6);
 
-	ht->thread = g_thread_create (hostname_thread_worker, ht, FALSE, NULL);
+	ht->thread = X_THREAD_CREATE (hostname_thread_worker, ht);
 	if (!ht->thread) {
 		hostname_thread_free (ht);
 		return NULL;
@@ -189,9 +212,9 @@ hostname_thread_kill (HostnameThread *ht)
 
 	nm_log_dbg (LOGD_DNS, "(%p) stopping reverse-lookup thread", ht);
 
-	g_mutex_lock (ht->lock);
+	X_MUTEX_LOCK (ht->lock);
 	ht->dead = TRUE;
-	g_mutex_unlock (ht->lock);
+	X_MUTEX_UNLOCK (ht->lock);
 }
 
 gboolean
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 5c4059e1..669db28b 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -71,6 +71,7 @@ struct NMPolicy {
 
 	char *orig_hostname; /* hostname at NM start time */
 	char *cur_hostname;  /* hostname we want to assign */
+	gboolean hostname_changed;  /* TRUE if NM ever set the hostname */
 };
 
 #define RETRIES_TAG "autoconnect-retries"
@@ -228,20 +229,38 @@ get_best_ip6_device (NMManager *manager, NMActRequest **out_req)
 
 static void
 _set_hostname (NMPolicy *policy,
-               gboolean change_hostname,
                const char *new_hostname,
                const char *msg)
 {
-	if (change_hostname) {
-		NMDnsManager *dns_mgr;
+	NMDnsManager *dns_mgr;
 
-		g_free (policy->cur_hostname);
-		policy->cur_hostname = g_strdup (new_hostname);
+	/* The incoming hostname *can* be NULL, which will get translated to
+	 * 'localhost.localdomain' or such in the hostname policy code, but we
+	 * keep cur_hostname = NULL in the case because we need to know that
+	 * there was no valid hostname to start with.
+	 */
 
-		dns_mgr = nm_dns_manager_get (NULL);
-		nm_dns_manager_set_hostname (dns_mgr, policy->cur_hostname);
-		g_object_unref (dns_mgr);
-	}
+	/* Don't change the hostname or update DNS this is the first time we're
+	 * trying to change the hostname, and it's not actually changing.
+	 */
+	if (   policy->orig_hostname
+	    && (policy->hostname_changed == FALSE)
+	    && g_strcmp0 (policy->orig_hostname, new_hostname) == 0)
+		return;
+
+	/* Don't change the hostname or update DNS if the hostname isn't actually
+	 * going to change.
+	 */
+	if (g_strcmp0 (policy->cur_hostname, new_hostname) == 0)
+		return;
+
+	g_free (policy->cur_hostname);
+	policy->cur_hostname = g_strdup (new_hostname);
+	policy->hostname_changed = TRUE;
+
+	dns_mgr = nm_dns_manager_get (NULL);
+	nm_dns_manager_set_hostname (dns_mgr, policy->cur_hostname);
+	g_object_unref (dns_mgr);
 
 	if (nm_policy_set_system_hostname (policy->cur_hostname, msg))
 		nm_utils_call_dispatcher ("hostname", NULL, NULL, NULL, NULL, NULL);
@@ -262,10 +281,10 @@ lookup_callback (HostnameThread *thread,
 		if (!hostname) {
 			/* Fall back to localhost.localdomain */
 			msg = g_strdup_printf ("address lookup failed: %d", result);
-			_set_hostname (policy, TRUE, NULL, msg);
+			_set_hostname (policy, NULL, msg);
 			g_free (msg);
 		} else
-			_set_hostname (policy, TRUE, hostname, "from address lookup");
+			_set_hostname (policy, hostname, "from address lookup");
 	}
 	hostname_thread_free (thread);
 }
@@ -297,7 +316,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 	/* Try a persistent hostname first */
 	g_object_get (G_OBJECT (policy->manager), NM_MANAGER_HOSTNAME, &configured_hostname, NULL);
 	if (configured_hostname) {
-		_set_hostname (policy, TRUE, configured_hostname, "from system configuration");
+		_set_hostname (policy, configured_hostname, "from system configuration");
 		g_free (configured_hostname);
 		return;
 	}
@@ -312,7 +331,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 		/* No best device; fall back to original hostname or if there wasn't
 		 * one, 'localhost.localdomain'
 		 */
-		_set_hostname (policy, TRUE, policy->orig_hostname, "no default device");
+		_set_hostname (policy, policy->orig_hostname, "no default device");
 		return;
 	}
 
@@ -327,7 +346,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 				/* Sanity check; strip leading spaces */
 				while (*p) {
 					if (!isblank (*p++)) {
-						_set_hostname (policy, TRUE, p-1, "from DHCPv4");
+						_set_hostname (policy, p-1, "from DHCPv4");
 						return;
 					}
 				}
@@ -346,7 +365,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 				/* Sanity check; strip leading spaces */
 				while (*p) {
 					if (!isblank (*p++)) {
-						_set_hostname (policy, TRUE, p-1, "from DHCPv6");
+						_set_hostname (policy, p-1, "from DHCPv6");
 						return;
 					}
 				}
@@ -360,7 +379,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 	 * when NM started up.
 	 */
 	if (policy->orig_hostname) {
-		_set_hostname (policy, TRUE, policy->orig_hostname, "from system startup");
+		_set_hostname (policy, policy->orig_hostname, "from system startup");
 		return;
 	}
 
@@ -376,7 +395,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 		    || (nm_ip4_config_get_num_nameservers (ip4_config) == 0)
 		    || (nm_ip4_config_get_num_addresses (ip4_config) == 0)) {
 			/* No valid IP4 config (!!); fall back to localhost.localdomain */
-			_set_hostname (policy, TRUE, NULL, "no IPv4 config");
+			_set_hostname (policy, NULL, "no IPv4 config");
 			return;
 		}
 
@@ -394,7 +413,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 		    || (nm_ip6_config_get_num_nameservers (ip6_config) == 0)
 		    || (nm_ip6_config_get_num_addresses (ip6_config) == 0)) {
 			/* No valid IP6 config (!!); fall back to localhost.localdomain */
-			_set_hostname (policy, TRUE, NULL, "no IPv6 config");
+			_set_hostname (policy, NULL, "no IPv6 config");
 			return;
 		}
 
@@ -407,7 +426,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 
 	if (!policy->lookup) {
 		/* Fall back to 'localhost.localdomain' */
-		_set_hostname (policy, TRUE, NULL, "error starting hostname thread");
+		_set_hostname (policy, NULL, "error starting hostname thread");
 	}
 }
 
@@ -1023,6 +1042,15 @@ device_state_changed (NMDevice *device,
 		update_routing_and_dns (policy, FALSE);
 		break;
 	case NM_DEVICE_STATE_UNMANAGED:
+		if (   old_state == NM_DEVICE_STATE_UNAVAILABLE
+		    || old_state == NM_DEVICE_STATE_DISCONNECTED) {
+			/* If the device was never activated, there's no point in
+			 * updating routing or DNS.  This allows us to keep the previous
+			 * resolv.conf or routes from before NM started if no device was
+			 * ever managed by NM.
+			 */
+			break;
+		}
 	case NM_DEVICE_STATE_UNAVAILABLE:
 		update_routing_and_dns (policy, FALSE);
 		break;
diff --git a/src/ppp-manager/Makefile.in b/src/ppp-manager/Makefile.in
index 6971408f..90f855b3 100644
--- a/src/ppp-manager/Makefile.in
+++ b/src/ppp-manager/Makefile.in
@@ -185,6 +185,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@
diff --git a/src/settings/Makefile.in b/src/settings/Makefile.in
index 09da869d..b4f4508f 100644
--- a/src/settings/Makefile.in
+++ b/src/settings/Makefile.in
@@ -211,6 +211,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@
diff --git a/src/settings/plugins/Makefile.in b/src/settings/plugins/Makefile.in
index c23e3be0..7c9c8784 100644
--- a/src/settings/plugins/Makefile.in
+++ b/src/settings/plugins/Makefile.in
@@ -160,6 +160,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@
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.in b/src/settings/plugins/ifcfg-rh/Makefile.in
index b904563a..79b66b2d 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/Makefile.in
@@ -230,6 +230,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@
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
index 6c509fd0..71c5d60b 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
@@ -191,6 +191,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@
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
index 7a00bcfd..6292f12c 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
@@ -115,6 +115,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@
diff --git a/src/settings/plugins/ifcfg-suse/Makefile.in b/src/settings/plugins/ifcfg-suse/Makefile.in
index b8017e24..dfa84086 100644
--- a/src/settings/plugins/ifcfg-suse/Makefile.in
+++ b/src/settings/plugins/ifcfg-suse/Makefile.in
@@ -178,6 +178,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@
diff --git a/src/settings/plugins/ifnet/Makefile.in b/src/settings/plugins/ifnet/Makefile.in
index 519e07c0..8218b85a 100644
--- a/src/settings/plugins/ifnet/Makefile.in
+++ b/src/settings/plugins/ifnet/Makefile.in
@@ -226,6 +226,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@
diff --git a/src/settings/plugins/ifnet/tests/Makefile.in b/src/settings/plugins/ifnet/tests/Makefile.in
index d2cbb871..fe7f40e2 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.in
+++ b/src/settings/plugins/ifnet/tests/Makefile.in
@@ -149,6 +149,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@
diff --git a/src/settings/plugins/ifupdown/Makefile.in b/src/settings/plugins/ifupdown/Makefile.in
index b6896b59..98dded68 100644
--- a/src/settings/plugins/ifupdown/Makefile.in
+++ b/src/settings/plugins/ifupdown/Makefile.in
@@ -225,6 +225,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@
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.in b/src/settings/plugins/ifupdown/tests/Makefile.in
index 3c8bf793..aca48837 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.in
+++ b/src/settings/plugins/ifupdown/tests/Makefile.in
@@ -149,6 +149,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@
diff --git a/src/settings/plugins/keyfile/Makefile.in b/src/settings/plugins/keyfile/Makefile.in
index cf821e46..ae0c9f8e 100644
--- a/src/settings/plugins/keyfile/Makefile.in
+++ b/src/settings/plugins/keyfile/Makefile.in
@@ -201,6 +201,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@
diff --git a/src/settings/plugins/keyfile/tests/Makefile.in b/src/settings/plugins/keyfile/tests/Makefile.in
index 9d4f478d..c1fc662d 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/Makefile.in
@@ -187,6 +187,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@
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
index 3408cb15..0ea23ebc 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
@@ -115,6 +115,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@
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index db43b233..2babe267 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -679,7 +679,7 @@ cert_writer (GKeyFile *file,
 	}
 	g_return_if_fail (objtype != NULL);
 
-	scheme = objtypes->scheme_func (NM_SETTING_802_1X (setting));
+	scheme = objtype->scheme_func (NM_SETTING_802_1X (setting));
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
 		path = objtype->path_func (NM_SETTING_802_1X (setting));
 		g_assert (path);
diff --git a/src/settings/tests/Makefile.in b/src/settings/tests/Makefile.in
index 94ae4830..7c966ba2 100644
--- a/src/settings/tests/Makefile.in
+++ b/src/settings/tests/Makefile.in
@@ -151,6 +151,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@
diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in
index 3a9c43f4..5a7a2f2f 100644
--- a/src/supplicant-manager/Makefile.in
+++ b/src/supplicant-manager/Makefile.in
@@ -192,6 +192,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@
diff --git a/src/supplicant-manager/tests/Makefile.in b/src/supplicant-manager/tests/Makefile.in
index e0fa89e6..25e60e86 100644
--- a/src/supplicant-manager/tests/Makefile.in
+++ b/src/supplicant-manager/tests/Makefile.in
@@ -151,6 +151,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@
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index a60ca43f..39390e4b 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -168,6 +168,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@
diff --git a/src/vpn-manager/Makefile.in b/src/vpn-manager/Makefile.in
index 8999e831..51a12507 100644
--- a/src/vpn-manager/Makefile.in
+++ b/src/vpn-manager/Makefile.in
@@ -153,6 +153,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@
diff --git a/src/wimax/Makefile.in b/src/wimax/Makefile.in
index 1be78482..e9b51e9f 100644
--- a/src/wimax/Makefile.in
+++ b/src/wimax/Makefile.in
@@ -149,6 +149,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@
diff --git a/test/Makefile.in b/test/Makefile.in
index 456a2648..f8d7cfa3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -168,6 +168,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@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5f0ecb3b..619c2cb5 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -115,6 +115,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@
-- 
cgit 1.3.0-6-gf8a5